fix: correct raw string literal parsing

tree-sitter · Nov 24, 2024 · c0ac7e5 · c0ac7e5
1 parent 38154b9
commit c0ac7e5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/grammar.js b/grammar.js
@@ -858,7 +858,7 @@ module.exports = grammar({
 
     raw_string_literal: $ => seq(
       '`',
-      alias(/[^`]*/, $.raw_string_literal_content),
+      alias(token(prec(1, /[^`]*/)), $.raw_string_literal_content),
       '`',
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/literals.txt b/test/corpus/literals.txt
@@ -297,7 +297,8 @@ const (
   a = "0"
   b = "`\"`"
   c = "\x0c"
-  d = "errorstring
+  d = `//`
+  e = "errorstring
   "
 )
 
@@ -310,7 +311,8 @@ const (
     (const_spec
       (identifier)
       (expression_list
-        (interpreted_string_literal (interpreted_string_literal_content))))
+        (interpreted_string_literal
+          (interpreted_string_literal_content))))
     (const_spec
       (identifier)
       (expression_list
@@ -323,6 +325,11 @@ const (
       (expression_list
         (interpreted_string_literal
           (escape_sequence))))
+    (const_spec
+      (identifier)
+      (expression_list
+        (raw_string_literal
+          (raw_string_literal_content))))
     (ERROR
       (identifier)
       (interpreted_string_literal_content))))
-Original file line number
+Diff line change
@@ Expand Up / @@ -858,7 +858,7 @@ module.exports = grammar({ @@
         raw_string_literal: $ => seq(
           '`',
-          alias(/[^`]*/, $.raw_string_literal_content),
+          alias(token(prec(1, /[^`]*/)), $.raw_string_literal_content),
           '`',
         ),
@@ Expand Down @@