Escape characters are valid without string quoting

SublimeText · Feb 1, 2020 · 43a437b · 43a437b
1 parent d83caa6
commit 43a437b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
@@ -36,7 +36,7 @@ contexts:
     - include: hashtable
     - include: strings
     - include: script-block
-    # - include: double-quoted-string-escapes
+    - include: escape-characters
     - include: numeric-constant
     - match: (@)(\()
       captures:
@@ -204,7 +204,7 @@ contexts:
             - include: variable-no-property
             - include: hashtable
             - include: script-block
-            - include: double-quoted-string-escapes
+            - include: escape-characters
             - include: double-quoted-string
             - include: type
             - include: numeric-constant
@@ -281,7 +281,7 @@ contexts:
           scope: punctuation.definition.string.end.powershell
           pop: true
         - include: variable-no-property
-        - include: double-quoted-string-escapes
+        - include: escape-characters
         - include: interpolation
     - match: \@'(?=$)
       scope: punctuation.definition.string.begin.powershell
@@ -309,7 +309,9 @@ contexts:
       scope: punctuation.definition.string.begin.powershell
       push:
         - meta_scope: string.quoted.double.powershell
-        - include: double-quoted-string-escapes
+        - match: '""'
+          scope: constant.character.escape.powershell
+        - include: escape-characters
         - match: '"'
           scope: punctuation.definition.string.end.powershell
           pop: true
@@ -320,13 +322,11 @@ contexts:
         - match: '`\s*$'
           scope: keyword.other.powershell
 
-  double-quoted-string-escapes:
+  escape-characters:
     - match: '`[0abenfrvt"''$`]'
       scope: constant.character.escape.powershell
     - match: '`u\{\h+\}'
       scope: constant.character.escape.powershell
-    - match: '""'
-      scope: constant.character.escape.powershell
 
   function:
     - match: ^(?:\s*)(?i)(function|filter|configuration|workflow)\s+(?:(global|local|script|private):)?((?:\p{L}|\d|_|-|\.)+)

diff --git a/Tests/syntax_test_PowerShell.ps1 b/Tests/syntax_test_PowerShell.ps1
@@ -428,8 +428,7 @@ $This is a 'double quoted'
 #^^^^ variable.language
 Isn't it "nice"??
 There is no @platting here!
-#           ^ - punctuation.definition.variable
-#            ^ - variable.other.readwrite
+#           ^^^^^^^^^ - variable - punctuation
 "@
 # <- string.quoted.double.heredoc
  # <- string.quoted.double.heredoc
@@ -1306,6 +1305,10 @@ New-Object -TypeName System.Diagnostics.Process
 #                                       ^^^^^^^ - keyword.control
 New-Object -TypeName System.Data
 #                           ^^^^ - keyword.control
+echo `"test`"
+#    ^^^^^^^^^ - string.quoted
+#    ^^ constant.character.escape
+#          ^^ constant.character.escape
 @("any","array","has").foreach({ $_ })
 # <- keyword.other.array.begin
 # ^ meta.group.array-expression