Stack function scopes over strings

Author: michaelblyons

PowerShell.sublime-syntax

@@ -318,27 +318,50 @@ contexts:
 
   commands-quoted:
     - match: (?={{single_quote}})
-      push: [in-command, expect-single-quoted-command]
+      push: [in-command, single-quoted-command-string]
     - match: (?={{double_quote}})
-      push: [in-command, expect-double-quoted-command]
+      push: [in-command, double-quoted-command-string]
 
-  expect-single-quoted-command:
-    - meta_scope: meta.function-call.powershell variable.function.powershell
-    - include: single-quoted-strings
+  single-quoted-command-string:
+    - match: '{{single_quote}}'
+      scope: punctuation.definition.string.begin.powershell
+      push: inside-single-quoted-command-string
     - include: immediately-pop
 
-  expect-double-quoted-command:
-    - meta_scope: meta.function-call.powershell variable.function.powershell
-    - include: double-quoted-strings
+  inside-single-quoted-command-string:
+    - meta_include_prototype: false
+    - meta_scope: meta.string.powershell string.quoted.single.powershell meta.function-call.powershell variable.function.powershell
+    - match: '{{single_quote}}{2}'
+      scope: constant.character.escape.powershell
+    - match: '{{single_quote}}'
+      scope: punctuation.definition.string.end.powershell
+      pop: 1
+    - include: path-punctuation
+
+  double-quoted-command-string:
+    - match: '{{double_quote}}'
+      scope: punctuation.definition.string.begin.powershell
+      push: inside-double-quoted-command-string
     - include: immediately-pop
 
+  inside-double-quoted-command-string:
+    - meta_include_prototype: false
+    - meta_scope: meta.string.interpolated.powershell string.quoted.double.powershell meta.function-call.powershell variable.function.powershell
+    - match: '{{double_quote}}{2}'
+      scope: constant.character.escape.powershell
+    - include: escape-sequences
+    - match: '{{double_quote}}'
+      scope: punctuation.definition.string.end.powershell
+      pop: 1
+    - include: string-interpolations
+    - include: path-punctuation
+
   command-freeform:
     - match: '{{identifier_simple}}'
       scope: meta.function-call.powershell variable.function.powershell
       push: in-command
 
   in-command:
-    # - meta_scope: region.pinkish
     - include: redirection
     - include: command-ending-sequences
     - include: cli-parameters
@@ -349,8 +372,7 @@ contexts:
         - meta_scope: string.unquoted.powershell
         - match: (?=[\s#|>;,]|$)
           pop: 1
-        - match: '[\\/:.]'
-          scope: punctuation.separator.powershell
+        - include: path-punctuation
         - include: escape-sequences
 
   command-ending-sequences:
@@ -1212,6 +1234,10 @@ contexts:
 
 ###[ COMPONENTS ]##############################################################
 
+  path-punctuation:
+    - match: '[:/\\.]+'
+      scope: punctuation.separator.powershell
+
   line-continuations:
     - match: (`)\n
       captures:

Tests/syntax_test_PowerShell.ps1

@@ -922,12 +922,23 @@ $a3[1..2]
 #   ^^^^^^^^^^ meta.function-call.powershell variable.function.powershell
 #   @@@@@@@@@@ reference
 
-    & ".\script name with spaces.ps1"
+    & '.\script name with spaces.ps1'
 #   ^ keyword.operator.call.powershell
-#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell meta.string.interpolated.powershell string.quoted.double.powershell
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.powershell string.quoted.single.powershell meta.function-call.powershell variable.function.powershell
+#     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ reference
 #     ^ punctuation.definition.string.begin.powershell
+#      ^^ punctuation.separator.powershell
+#                               ^ punctuation.separator.powershell
 #                                   ^ punctuation.definition.string.end.powershell
+
+    & ".\script name with spaces.ps1"
+#   ^ keyword.operator.call.powershell
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.interpolated.powershell string.quoted.double.powershell meta.function-call.powershell variable.function.powershell
 #     @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ reference
+#     ^ punctuation.definition.string.begin.powershell
+#      ^^ punctuation.separator.powershell
+#                               ^ punctuation.separator.powershell
+#                                   ^ punctuation.definition.string.end.powershell
 
 # switch
 switch ("fourteen") {}