fix: allow escape sequence in regexp class

iorate · Aug 25, 2024 · 1a40a1f · 1a40a1f
1 parent 18af182
commit 1a40a1f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/scripts/ruleset/parser.js b/src/scripts/ruleset/parser.js
diff --git a/src/scripts/ruleset/ruleset.grammar b/src/scripts/ruleset/ruleset.grammar
@@ -70,7 +70,7 @@ expression[@isGroup=Expression] {
   RegExp { "/" regExpPattern "/" regExpFlags? }
   regExpPattern { (regExpEscape | "[" regExpClassContent* "]" | regExpContent)+ }
   regExpEscape { "\\" ![\n] }
-  regExpClassContent { ![\]\\\n] }
+  regExpClassContent { ![\]\\\n] | "\\" ![\n] }
   regExpContent { ![/\\[\n] }
   regExpFlags { $[imsu]+ }
 

diff --git a/src/scripts/ruleset/ruleset.test.ts b/src/scripts/ruleset/ruleset.test.ts
@@ -367,6 +367,33 @@ test("Ruleset", async (t) => {
         !ruleset.test({ url: "http://example.com/", title: "foo bar \\xA" }),
       );
     }
+    // Regular expression Literals
+    // Escape sequence in class characters
+    // https://github.com/iorate/ublacklist/issues/527
+    {
+      const ruleset = new Ruleset(String.raw`title=~/[\u3040-\u309F]/`);
+      assert.ok(
+        ruleset.test({
+          url: "http://example.com/",
+          title: "ひらがな",
+        }),
+      );
+      assert.ok(
+        !ruleset.test({
+          url: "http://example.com/",
+          title: "カタカナ",
+        }),
+      );
+    }
+    {
+      const ruleset = new Ruleset(String.raw`title=~/[\u3040-\u309G]/`);
+      assert.ok(
+        !ruleset.test({
+          url: "http://example.com/",
+          title: "ひらがな",
+        }),
+      );
+    }
   });
 
   await t.test("Complex expressions", () => {