Rescope pipes again

Author: michaelblyons

PowerShell.sublime-syntax

@@ -383,14 +383,18 @@ contexts:
       pop: 1
 
   pop-pipe:
-    - match: (\|)\s*\n
+    - match: (?:(\|)|(\|\||&&))\s*\n
       captures:
-        1: keyword.operator.assignment.pipe.powershell
+        1: keyword.operator.pipe.powershell
+        2: keyword.operator.pipe.conditional.powershell
       push:
         - match: ^
           pop: 2
+    - match: \|\||&&
+      scope: keyword.operator.pipe.conditional.powershell
+      pop: 1
     - match: \|
-      scope: keyword.operator.assignment.pipe.powershell
+      scope: keyword.operator.pipe.powershell
       pop: 1
 
   cli-parameters:
@@ -899,14 +903,18 @@ contexts:
         1: punctuation.definition.keyword.powershell
 
   operator-symbols:
-    # Assignment context
+    # Pipes
+    - match: \|\||&&
+      scope: keyword.operator.pipe.conditional.powershell
+    - match: \|
+      scope: keyword.operator.pipe.powershell
+
+    # Assignment with context
     - include: assignment-normal
     - match: (?:[+/*%-]|\?\?)=
       scope: keyword.operator.assignment.augmented.powershell
       push: in-assignment
     # Assignment same context
-    - match: \|
-      scope: keyword.operator.assignment.pipe.powershell
     - match: (?:\+\+|--)(?![ \t]*\d|[[:alpha:]])
       scope: keyword.operator.assignment.powershell
 
@@ -928,8 +936,6 @@ contexts:
 
     - match: \!
       scope: keyword.operator.logical.powershell
-    - match: \|\||&&
-      scope: keyword.operator.logical.powershell
     - match: \?\?
       scope: keyword.operator.null-coalescing.powershell
     - match: '[?:]'

Tests/syntax_test_PowerShell.ps1

@@ -880,7 +880,7 @@ $a3[1..2]
 #                     ^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
 #                      ^^ keyword.operator.range.powershell
 #                        ^^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
-#                           ^ keyword.operator.assignment.pipe.powershell
+#                           ^ keyword.operator.pipe.powershell
 #                             ^^^^^^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                             @@@@@@@@@@@@@@@@ reference
 #                                             ^ punctuation.section.group.end.powershell
@@ -899,7 +899,7 @@ $a3[1..2]
 #                           ^^^ variable.parameter.option.powershell
 #                           ^ punctuation.definition.parameter.powershell
 #                               ^^ meta.number.integer.decimal.powershell constant.numeric.value.powershell
-#                                  ^ keyword.operator.assignment.pipe.powershell
+#                                  ^ keyword.operator.pipe.powershell
 #                                    ^^^^^^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                                    @@@@@@@@@@@@@@@@ reference
 #                                                    ^^^^^^^^ meta.function-call.arguments.powershell
@@ -926,7 +926,7 @@ $a3[1..2]
 #^^^^^^^^^ meta.function-call.arguments.powershell
 #^^^^^^^^ meta.block.powershell
 #       ^ punctuation.section.braces.end.powershell
-#         ^ keyword.operator.assignment.pipe.powershell
+#         ^ keyword.operator.pipe.powershell
 #           ^^^^^^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #           @@@@@@@@@@@@@@@@ reference
 
@@ -952,7 +952,7 @@ $a3[1..2]
 #   ^ punctuation.definition.parameter.powershell
 #       ^^^^^^ variable.other.readwrite.powershell
 #       ^ punctuation.definition.variable.powershell
-#              ^ keyword.operator.assignment.pipe.powershell
+#              ^ keyword.operator.pipe.powershell
 #                ^^^^^^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                @@@@@@@@@@@@@@@@ reference
 #                                ^^^^^^^^^ meta.function-call.arguments.powershell
@@ -963,7 +963,7 @@ $a3[1..2]
 #   ^^^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #   @@@@@@@@@@@@@ reference
 #                ^^ meta.function-call.arguments.powershell
-#                 ^ keyword.operator.assignment.pipe.powershell
+#                 ^ keyword.operator.pipe.powershell
       Select Name,Length
 #     ^^^^^^ meta.function-call.powershell variable.function.powershell
 #     @@@@@@ reference
@@ -972,6 +972,18 @@ $a3[1..2]
 #                ^ punctuation.separator.sequence.powershell
 #                 ^^^^^^ string.unquoted.powershell
 
+    Do-Something && ContinueOn-Success || ContinueOn-Failure
+#   ^^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell
+#   @@@@@@@@@@@@ reference
+#               ^ meta.function-call.arguments.powershell
+#                ^^ keyword.operator.pipe.conditional.powershell
+#                   ^^^^^^^^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell
+#                   @@@@@@@@@@@@@@@@@@ reference
+#                                     ^ meta.function-call.arguments.powershell
+#                                      ^^ keyword.operator.pipe.conditional.powershell
+#                                         ^^^^^^^^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell
+#                                         @@@@@@@@@@@@@@@@@@ reference
+
     # Commands (Built-in variables)
     ls *.ps1 -recurse
 #   ^^ meta.function-call.powershell variable.function.powershell
@@ -1341,7 +1353,7 @@ $a3[1..2]
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.powershell
 #       ^^^^^^ variable.other.readwrite.powershell
 #       ^ punctuation.definition.variable.powershell
-#              ^ keyword.operator.assignment.pipe.powershell
+#              ^ keyword.operator.pipe.powershell
 #                ^ meta.function-call.powershell variable.function.powershell
 #                @ reference
 #                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.powershell
@@ -1358,7 +1370,7 @@ $a3[1..2]
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.powershell
 #       ^^^^^^ variable.other.readwrite.powershell
 #       ^ punctuation.definition.variable.powershell
-#              ^ keyword.operator.assignment.pipe.powershell
+#              ^ keyword.operator.pipe.powershell
 #                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.powershell variable.function.powershell
 #                @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ reference
 #                                                            ^^^^^^^ meta.function-call.arguments.powershell
@@ -1984,7 +1996,7 @@ $a3[1..2]
     $ScriptBlock | Out-File $file -Force
 #   ^^^^^^^^^^^^ variable.other.readwrite.powershell
 #   ^ punctuation.definition.variable.powershell
-#                ^ keyword.operator.assignment.pipe.powershell
+#                ^ keyword.operator.pipe.powershell
 #                  ^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                  @@@@@@@@ reference
 #                          ^^^^^^^^^^^^^ meta.function-call.arguments.powershell
@@ -2010,7 +2022,7 @@ $a3[1..2]
 #    ^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #    @@@@@@@@@ reference
 #             ^ meta.function-call.arguments.powershell
-#              ^ keyword.operator.assignment.pipe.powershell
+#              ^ keyword.operator.pipe.powershell
 #                ^^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                @@@@@@@@@@@ reference
 #                           ^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.powershell
@@ -2037,7 +2049,7 @@ $a3[1..2]
 #                               ^^^^^^^^^^ meta.function-call.powershell support.function.powershell
 #                               @@@@@@@@@@ reference
 #                                         ^ meta.function-call.arguments.powershell
-#                                          ^ keyword.operator.assignment.pipe.powershell
+#                                          ^ keyword.operator.pipe.powershell
 #                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.powershell
 #                                            ^ keyword.control.loop.for.powershell
 #                                             ^ punctuation.section.braces.begin.powershell