Let pipe end the stop-parsing token

Author: michaelblyons

PowerShell.sublime-syntax

@@ -80,7 +80,6 @@ contexts:
     - include: requires-directives
 
     - include: escape-sequences
-    - include: stop-parsing-token
 
     # Normal code
     - include: types
@@ -331,18 +330,21 @@ contexts:
   in-command:
     - meta_content_scope: meta.function-call.arguments.powershell
     - include: pop-end-of-command
+    - include: stop-parsing-token
     - include: redirection
     - include: cli-parameters
     - include: expressions-without-commands
     - match: (?=\S)
-      push:
-        - meta_include_prototype: false
-        - meta_scope: string.unquoted.powershell
-        - match: (?=[\s#|>;,]|$)
-          pop: 1
-        - include: path-punctuation
-        - include: escape-sequences
-        - include: string-wildcards
+      push: inside-unquoted-string
+
+  inside-unquoted-string:
+    - meta_include_prototype: false
+    - meta_scope: string.unquoted.powershell
+    - match: (?=[\s#|>;,]|$)
+      pop: 1
+    - include: path-punctuation
+    - include: escape-sequences
+    - include: string-wildcards
 
   pop-end-of-command:
     - include: line-continuations
@@ -381,6 +383,16 @@ contexts:
         2: punctuation.definition.parameter.powershell
         3: keyword.operator.assignment.powershell
 
+  stop-parsing-token:
+    - match: \B--%\B
+      scope: keyword.control.stop-parsing.powershell
+      set:
+        - meta_include_prototype: false
+        - meta_scope: meta.function-call.arguments.powershell
+        - meta_content_scope: string.unquoted.powershell
+        - include: pop-before-eol
+        - include: pop-pipe
+
 ###[ DIRECTIVES ]##############################################################
 
   requires-directives:
@@ -1279,14 +1291,6 @@ contexts:
 
 ###[ COMPONENTS ]##############################################################
 
-  stop-parsing-token:
-    - match: \B--%\B
-      scope: keyword.control.powershell
-      push:
-        - meta_include_prototype: false
-        - meta_content_scope: string.unquoted.powershell
-        - include: pop-before-eol
-
   path-punctuation:
     - match: ':(?=[\\/])'
       scope: punctuation.separator.path.powershell

tests/syntax_test_PowerShell.ps1

@@ -106,9 +106,19 @@ using namespace System.Management.Automation
 #                            ^ punctuation.definition.parameter.powershell
 #                                  ^^^^^^ variable.other.readwrite.powershell
 #                                  ^ punctuation.definition.variable.powershell
-#                                         ^^^ keyword.control.powershell
+#                                         ^^^ keyword.control.stop-parsing.powershell
 #                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.powershell
 
+    foo --% stop parsing until pipe | echo
+#   ^^^ meta.function-call.powershell variable.function.powershell
+#   @@@ reference
+#      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.powershell
+#       ^^^ keyword.control.stop-parsing.powershell
+#          ^^^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.powershell
+#                                   ^ keyword.operator.pipe.powershell
+#                                     ^^^^ meta.function-call.powershell variable.function.powershell
+#                                     @@@@ reference
+
     & gnutool.exe -s 'short option' --long-option --very_long_option value +plus-option
 #   ^ keyword.operator.call.powershell
 #     ^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell