From fd5d06d9591b7a8ad908219771c12ff2f1ef045e Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Sun, 17 Nov 2024 20:33:02 +0100
Subject: [PATCH] [ShellScript] Fix ZSH case clause termination (#4096)

This commit implements different sets of case clause terminators supported
by each shell script dialect:

  Bash: `;;`, `;&` and `;;&`
  ZSH:  `;;`, `;&` and `;|`
---
 ShellScript/Bash.sublime-syntax             | 4 +++-
 ShellScript/Zsh.sublime-syntax              | 4 +++-
 ShellScript/Zsh/tests/syntax_test_scope.zsh | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ShellScript/Bash.sublime-syntax b/ShellScript/Bash.sublime-syntax
index 9d8eadb85d..4d52ab795a 100644
--- a/ShellScript/Bash.sublime-syntax
+++ b/ShellScript/Bash.sublime-syntax
@@ -1222,7 +1222,7 @@ contexts:
     - include: statements
 
   case-clause-end:
-    - match: ;;&?|;&
+    - match: '{{case_clause_end}}'
       scope: meta.clause.shell punctuation.terminator.clause.shell
       pop: 1
 
@@ -3113,6 +3113,8 @@ variables:
   # in embed...escape statements.
   no_escape_behind: (?<![^\\]\\)(?<![\\]{3})
 
+  case_clause_end: ;;&?|;&
+
   # Parameter expansions
   is_interpolation: (?=\$[({{{identifier_char}}{{special_variables}}]|`)
   parameter_switch: '[AEKLPQUaku]'
diff --git a/ShellScript/Zsh.sublime-syntax b/ShellScript/Zsh.sublime-syntax
index 0d4cda1b1f..bef5049b51 100644
--- a/ShellScript/Zsh.sublime-syntax
+++ b/ShellScript/Zsh.sublime-syntax
@@ -175,7 +175,7 @@ contexts:
     - meta_scope: meta.clause.patterns.shell
     # comment, end of clause or end of line
     # indicate pattern being enclosed in balanced parentheses
-    - match: (?=(?:$|;;&?|;&|}|esac{{cmd_break}})|\s+#)
+    - match: (?=(?:$|}|{{case_clause_end}}|esac{{cmd_break}})|\s+#)
       fail: case-clause-paren-pattern
     - include: case-clause-pattern-body
 
@@ -1114,6 +1114,8 @@ variables:
   hex_digit: '[\h_]'
   oct_digit: '[0-7_]'
 
+  case_clause_end: ;[;&|]
+
   # Parameter expansions
   is_interpolation: (?=\$[({\[{{identifier_char}}{{special_variables}}]|`)
 
diff --git a/ShellScript/Zsh/tests/syntax_test_scope.zsh b/ShellScript/Zsh/tests/syntax_test_scope.zsh
index 660fe51d85..ed170e82b5 100644
--- a/ShellScript/Zsh/tests/syntax_test_scope.zsh
+++ b/ShellScript/Zsh/tests/syntax_test_scope.zsh
@@ -540,7 +540,7 @@ case $word {
         ;;
 #       ^^ punctuation.terminator.clause.shell
 
-    ((foo|bar)baz) cmd arg ;;
+    ((foo|bar)baz) cmd arg ;|
 #   ^ meta.clause.patterns.shell - meta.string - string
 #    ^^^^^^^^^ meta.clause.patterns.shell meta.string.glob.shell meta.group.regexp.shell string.unquoted.shell
 #             ^^^ meta.clause.patterns.shell meta.string.glob.shell string.unquoted.shell
@@ -556,7 +556,7 @@ case $word {
 #                      ^^^ meta.string.glob.shell string.unquoted.shell
 #                          ^^ punctuation.terminator.clause.shell
 
-    (foo|bar)baz) cmd arg ;;
+    (foo|bar)baz) cmd arg ;&
 #   ^^^^^^^^^ meta.clause.patterns.shell meta.string.glob.shell meta.group.regexp.shell string.unquoted.shell
 #            ^^^ meta.clause.patterns.shell meta.string.glob.shell string.unquoted.shell
 #               ^ meta.clause.patterns.shell - meta.string - string