fix: correctly parse regex literals

MXfive · Sep 6, 2024 · eced5b2 · eced5b2
1 parent 6bf0466
commit eced5b2
Show file tree

Hide file tree

Showing 4 changed files with 2,237 additions and 3,652 deletions.
diff --git a/grammar.js b/grammar.js
@@ -244,15 +244,25 @@ module.exports = grammar({
       choice('m', 'h', 'd')
     ),
 
-    regex_literal: _ => token(seq(
+    regex_literal: _ => seq(
       '/',
-      /[^/\\\*]/,
-      repeat(choice(
-        /[^/\\]/,
-        seq('\\', /./)
+      token.immediate(prec(-1,
+        repeat1(choice(
+          seq(
+            '[',
+            repeat(choice(
+              seq('\\', /./), // escaped character
+              /[^\]\n\\]/, // any character besides ']' or '\n'
+            )),
+            ']',
+          ), // square-bracket-delimited character class
+          seq('\\', /./), // escaped character
+          /[^/\\\[\n]/, // any character besides '[', '\', '/', '\n'
+        )),
       )),
-      '/'
-    )),
+      token.immediate(prec(1, '/')),
+    ),
+
 
     boolean_literal: _ => choice('true', 'false'),
 

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json