Fix escaped backslash at end of string (#162)

Fixes #159
rosshamish · May 13, 2024 · 0470269 · 0470269
1 parent 08a024b
commit 0470269
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 6 deletions.
diff --git a/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.json b/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.json
@@ -620,7 +620,7 @@
     "Escapes": {
       "patterns": [
         {
-          "match": "\\\\['\"]",
+          "match": "(\\\\['\"]|\\\\\\\\)",
           "name": "constant.character.escape.kusto"
         }
       ]

diff --git a/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.yml b/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.yml
@@ -337,7 +337,7 @@ repository:
         comment: https://learn.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/string
   Escapes:
     patterns:
-      - match: \\['"]
+      - match: (\\['"]|\\\\)
         name: constant.character.escape.kusto
   Numeric:
     patterns:

diff --git a/kusto-syntax-highlighting/test/snapshots/data-types/strings.kql b/kusto-syntax-highlighting/test/snapshots/data-types/strings.kql
@@ -19,7 +19,7 @@ print s1 = 'string with " (double quotes)',
 print myPath1 = @'C:\Folder\filename.txt'
 
 // Escaping using '\' notation
-print s = '\\n.*(>|\'|=|\")[a-zA-Z0-9/+]{86}=='
+print s = '\\n.*(>|\'|=|\")[a-zA-Z0-9/+]{86}==\\'
 
 // Encode a C# program in a Kusto multi-line string
 print program=```

diff --git a/kusto-syntax-highlighting/test/snapshots/data-types/strings.kql.snap b/kusto-syntax-highlighting/test/snapshots/data-types/strings.kql.snap
@@ -98,16 +98,18 @@
 >
 >// Escaping using '\' notation
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.kusto comment.line.kusto
->print s = '\\n.*(>|\'|=|\")[a-zA-Z0-9/+]{86}=='
+>print s = '\\n.*(>|\'|=|\")[a-zA-Z0-9/+]{86}==\\'
 #^^^^^ source.kusto keyword.other.query.kusto
 #     ^^^^^ source.kusto
 #          ^ source.kusto string.quoted.single.kusto punctuation.definition.string.kusto
-#           ^^^^^^^^ source.kusto string.quoted.single.kusto
+#           ^^ source.kusto string.quoted.single.kusto constant.character.escape.kusto
+#             ^^^^^^ source.kusto string.quoted.single.kusto
 #                   ^^ source.kusto string.quoted.single.kusto constant.character.escape.kusto
 #                     ^^^ source.kusto string.quoted.single.kusto
 #                        ^^ source.kusto string.quoted.single.kusto constant.character.escape.kusto
 #                          ^^^^^^^^^^^^^^^^^^^^ source.kusto string.quoted.single.kusto
-#                                              ^ source.kusto string.quoted.single.kusto punctuation.definition.string.kusto
+#                                              ^^ source.kusto string.quoted.single.kusto constant.character.escape.kusto
+#                                                ^ source.kusto string.quoted.single.kusto punctuation.definition.string.kusto
 >
 >// Encode a C# program in a Kusto multi-line string
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.kusto comment.line.kusto

diff --git a/kusto-syntax-highlighting/test/snapshots/regression-tests/escaped-backlash-in-string.kusto b/kusto-syntax-highlighting/test/snapshots/regression-tests/escaped-backlash-in-string.kusto
@@ -0,0 +1,4 @@
+let scannerId = "9d632724-5c18-43e9-9314-555e9587b30c";
+cluster("foo").database("bar").table("baz")
+| extend FileNameParts = split(FullFileName, "Modified\\")
+| extend FileName = trim("'", FileName)
diff --git a/...syntax-highlighting/test/snapshots/regression-tests/escaped-backlash-in-string.kusto.snap b/...syntax-highlighting/test/snapshots/regression-tests/escaped-backlash-in-string.kusto.snap
@@ -0,0 +1,49 @@
+>let scannerId = "9d632724-5c18-43e9-9314-555e9587b30c";
+#^^^ source.kusto keyword.control.kusto
+#   ^^^^^^^^^^^^^ source.kusto
+#                ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.kusto string.quoted.double.kusto
+#                                                     ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                                                      ^^ source.kusto
+>cluster("foo").database("bar").table("baz")
+#^^^^^^^ source.kusto meta.special.database.kusto support.function.kusto
+#       ^ source.kusto meta.special.database.kusto
+#        ^ source.kusto meta.special.database.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#         ^^^ source.kusto meta.special.database.kusto string.quoted.double.kusto
+#            ^ source.kusto meta.special.database.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#             ^ source.kusto meta.special.database.kusto
+#              ^ source.kusto
+#               ^^^^^^^^ source.kusto meta.special.database.kusto support.function.kusto
+#                       ^ source.kusto meta.special.database.kusto
+#                        ^ source.kusto meta.special.database.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                         ^^^ source.kusto meta.special.database.kusto string.quoted.double.kusto
+#                            ^ source.kusto meta.special.database.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                             ^ source.kusto meta.special.database.kusto
+#                              ^ source.kusto
+#                               ^^^^^ source.kusto support.function.kusto
+#                                    ^ source.kusto
+#                                     ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                                      ^^^ source.kusto string.quoted.double.kusto
+#                                         ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                                          ^^ source.kusto
+>| extend FileNameParts = split(FullFileName, "Modified\\")
+#^^ source.kusto
+#  ^^^^^^ source.kusto keyword.other.query.kusto
+#        ^^^^^^^^^^^^^^^^^ source.kusto
+#                         ^^^^^ source.kusto support.function.kusto
+#                              ^^^^^^^^^^^^^^^ source.kusto
+#                                             ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                                              ^^^^^^^^ source.kusto string.quoted.double.kusto
+#                                                      ^^ source.kusto string.quoted.double.kusto constant.character.escape.kusto
+#                                                        ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                                                         ^^ source.kusto
+>| extend FileName = trim("'", FileName)
+#^^ source.kusto
+#  ^^^^^^ source.kusto keyword.other.query.kusto
+#        ^^^^^^^^^^^^ source.kusto
+#                    ^^^^ source.kusto support.function.kusto
+#                        ^ source.kusto
+#                         ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                          ^ source.kusto string.quoted.double.kusto
+#                           ^ source.kusto string.quoted.double.kusto punctuation.definition.string.kusto
+#                            ^^^^^^^^^^^^ source.kusto