chore: rename escapes

Trevor: applied query fixes
tgross35 · Feb 18, 2024 · ece99ae · ece99ae
1 parent 5a1e57b
commit ece99ae
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 40 deletions.
diff --git a/grammar.js b/grammar.js
@@ -10,6 +10,8 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
+const ESCAPE_SEQUENCE = token(/\\[nrt"\\]/);
+
 /** Comma separated list with at least one item */
 function comma_sep1(item) {
   return seq(item, repeat(seq(",", item)));
@@ -314,10 +316,20 @@ module.exports = grammar({
       ),
 
     _raw_string_indented: (_) => seq("'''", repeat(/./), "'''"),
-    _string: ($) => seq('"', repeat(choice($.string_escape, /[^\\"]+/)), '"'),
+    _string: ($) =>
+      seq(
+        '"',
+        repeat(choice($.escape_sequence, /[^\\"]+/)),
+        '"',
+      ),
     _string_indented: ($) =>
-      seq('"""', repeat(choice($.string_escape, /[^\\"]+/)), '"""'),
-    string_escape: (_) => /\\[nrt"\\]/,
+      seq(
+        '"""',
+        repeat(choice($.escape_sequence, /[^\\"]+/)),
+        '"""',
+      ),
+
+    escape_sequence: (_) => ESCAPE_SEQUENCE,
 
     _backticked: (_) => seq("`", repeat(/./), "`"),
     _indented_backticked: (_) => seq("```", repeat(/./), "```"),

diff --git a/queries-src/highlights.scm b/queries-src/highlights.scm
@@ -71,7 +71,7 @@
 (dependency_expression recipe: (identifier) @function)
 
 ; handle escape sequences
-(string_literal (string_escape) @constant.character.escape)
+(string_literal (escape_sequence) @constant.character.escape)
 (string_literal) @string
 
 (comment) @comment.line

diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
@@ -73,7 +73,7 @@
 (dependency_expression recipe: (identifier) @function)
 
 ; handle escape sequences
-(string_literal (string_escape) @string.escape)
+(string_literal (escape_sequence) @string.escape)
 (string_literal) @string
 
 (comment) @comment

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
@@ -131,8 +131,8 @@ baz := "a\"\t"
       (expression
         (value
           (string_literal
-            (string_escape)
-            (string_escape))))
+            (escape_sequence)
+            (escape_sequence))))
       (eol)))
   (item
     (eol)))
@@ -175,8 +175,8 @@ def \"
       (expression
         (value
           (string_literal
-            (string_escape)
-            (string_escape))))
+            (escape_sequence)
+            (escape_sequence))))
       (eol)))
   (item
     (eol)))