Fix improper rejecting fitlers with $all,~document options

Related feedback: - uBlockOrigin/uBlock-issues#1134 (comment)
Rudxain · Jul 12, 2020 · 2eec285 · 2eec285
1 parent 1a9ad29
commit 2eec285
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/docs/tests/static-filtering-parser-checklist.txt b/docs/tests/static-filtering-parser-checklist.txt
@@ -25,7 +25,10 @@ $script,redirect=noop.js
 
 *$csp=default-src 'none'
 
-
+*$all,~document
+*$all,~popup
+*$all,~inline-script
+*$all,~inline-font
 
 
 !--------------------
@@ -50,3 +53,9 @@ $script,redirect=noop.js
 
 ! bad regex
 /(abc|def/$xhr
+
+! https://github.com/gorhill/uBlock/issues/2385#issuecomment-494078763
+*$~document
+*$~popup
+*$~inline-script
+*$~inline-font
diff --git a/src/js/static-filtering-parser.js b/src/js/static-filtering-parser.js
@@ -2011,8 +2011,8 @@ const netOptionTokens = new Map([
     [ 'css', OPTTokenCss | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],
         [ 'stylesheet', OPTTokenCss | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],
     [ 'denyallow', OPTTokenDenyAllow | OPTMustAssign | OPTDomainList ],
-    [ 'doc', OPTTokenDoc | OPTType | OPTNetworkType ],
-        [ 'document', OPTTokenDoc | OPTType | OPTNetworkType ],
+    [ 'doc', OPTTokenDoc | OPTType | OPTNetworkType | OPTCanNegate ],
+        [ 'document', OPTTokenDoc | OPTType | OPTNetworkType | OPTCanNegate ],
     [ 'domain', OPTTokenDomain | OPTMustAssign | OPTDomainList ],
     [ 'ehide', OPTTokenEhide | OPTType ],
         [ 'elemhide', OPTTokenEhide | OPTType ],
@@ -2025,8 +2025,8 @@ const netOptionTokens = new Map([
         [ 'generichide', OPTTokenGhide | OPTType ],
     [ 'image', OPTTokenImage | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],
     [ 'important', OPTTokenImportant | OPTBlockOnly ],
-    [ 'inline-font', OPTTokenInlineFont | OPTType ],
-    [ 'inline-script', OPTTokenInlineScript | OPTType ],
+    [ 'inline-font', OPTTokenInlineFont | OPTType | OPTCanNegate ],
+    [ 'inline-script', OPTTokenInlineScript | OPTType | OPTCanNegate ],
     [ 'media', OPTTokenMedia | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],
     [ 'mp4', OPTTokenMp4 | OPTType | OPTNetworkType | OPTBlockOnly | OPTRedirectType | OPTRedirectableType ],
     [ 'object', OPTTokenObject | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],
@@ -2035,7 +2035,7 @@ const netOptionTokens = new Map([
     [ 'ping', OPTTokenPing | OPTCanNegate | OPTType | OPTNetworkType ],
         [ 'beacon', OPTTokenPing | OPTCanNegate | OPTType | OPTNetworkType ],
     [ 'popunder', OPTTokenPopunder | OPTType ],
-    [ 'popup', OPTTokenPopup | OPTType ],
+    [ 'popup', OPTTokenPopup | OPTType | OPTCanNegate ],
     [ 'redirect', OPTTokenRedirect | OPTMustAssign | OPTBlockOnly | OPTRedirectType ],
     [ 'redirect-rule', OPTTokenRedirectRule | OPTMustAssign | OPTBlockOnly | OPTRedirectType ],
     [ 'script', OPTTokenScript | OPTCanNegate | OPTType | OPTNetworkType | OPTRedirectableType ],