Merge pull request #115 from crystal-lang-tools/keidax/escape-cleanup

Use `escape_sequence` for all escape types

Author: keidax

grammar.js

@@ -706,7 +706,7 @@ module.exports = grammar({
       '\'',
       choice(
         alias(token.immediate(prec(1, /[^\\]/)), $.literal_content),
-        $.char_escape_sequence,
+        alias($.char_escape_sequence, $.escape_sequence),
       ),
       token.immediate('\''),
     ),
@@ -731,8 +731,8 @@ module.exports = grammar({
     _string_literal_content: $ => repeat1(choice(
       $._line_continuation,
       alias($._delimited_string_contents, $.literal_content),
-      $.string_escape_sequence,
-      $.ignored_backslash,
+      alias($.string_escape_sequence, $.escape_sequence),
+      alias($.ignored_backslash, $.escape_sequence),
       $.interpolation,
     )),
 
@@ -779,8 +779,8 @@ module.exports = grammar({
     _string_percent_literal_content: $ => repeat1(choice(
       alias($._delimited_string_contents, $.literal_content),
       $.interpolation,
-      $.string_escape_sequence,
-      $.ignored_backslash,
+      alias($.string_escape_sequence, $.escape_sequence),
+      alias($.ignored_backslash, $.escape_sequence),
     )),
 
     string_array_percent_literal: $ => seq(
@@ -803,7 +803,7 @@ module.exports = grammar({
       $._delimited_array_element_start,
       repeat(choice(
         alias($._delimited_string_contents, $.literal_content),
-        alias($.percent_array_escape_sequence, $.ignored_backslash),
+        alias($.percent_array_escape_sequence, $.escape_sequence),
       )),
       $._delimited_array_element_end,
     ),
@@ -818,8 +818,8 @@ module.exports = grammar({
       repeat(choice(
         alias($.heredoc_content, $.literal_content),
         $.interpolation,
-        seq(/\s*/, $.string_escape_sequence),
-        seq(/\s*/, $.ignored_backslash),
+        seq(/\s*/, alias($.string_escape_sequence, $.escape_sequence)),
+        seq(/\s*/, alias($.ignored_backslash, $.escape_sequence)),
         $._line_continuation,
       )),
       $.heredoc_end,
@@ -860,8 +860,8 @@ module.exports = grammar({
         seq(
           repeat(choice(
             symbol_content,
-            $.string_escape_sequence,
-            $.ignored_backslash,
+            alias($.string_escape_sequence, $.escape_sequence),
+            alias($.ignored_backslash, $.escape_sequence),
           )),
           token.immediate('"'),
         ),

queries/nvim/highlights.scm

@@ -76,6 +76,9 @@
 (string
   (literal_content) @string)
 
+(string
+  (escape_sequence) @string.escape)
+
 (symbol
   [
    ":"
@@ -86,12 +89,18 @@
 (symbol
   (literal_content) @string.special.symbol)
 
+(symbol
+  (escape_sequence) @character)
+
 (command
   "`" @string.special)
 
 (command
   (literal_content) @string.special)
 
+(command
+  (escape_sequence) @character)
+
 (regex
   "/" @punctuation.bracket)
 
@@ -103,19 +112,23 @@
 (heredoc_body
   (literal_content) @string)
 
+(heredoc_body
+  (escape_sequence) @string.escape)
+
 [
   (heredoc_start)
   (heredoc_end)
 ] @label
 
-(string_escape_sequence) @string.escape
-
 (char
   "'" @character)
 
 (char
   (literal_content) @character)
 
+(char
+  (escape_sequence) @string.escape)
+
 (integer) @number
 
 (float) @number.float