[ShellScript] Add ZSH

Groovy/tests/syntax_test_jenkins.Jenkinsfile

@@ -27,7 +27,7 @@ def call() {
 //     ^^^ meta.block.groovy meta.string.embedded-shell.groovy punctuation.definition.string.begin.groovy
 //        ^ meta.block.groovy meta.string.embedded-shell.groovy string.quoted.single.block.groovy source.shell.bash comment.line.number-sign.shell punctuation.definition.comment.shell
           echo "hello ${world}"
-//        ^^^^ meta.block.groovy meta.string.embedded-shell.groovy string.quoted.single.block.groovy source.shell.bash meta.function-call.identifier.shell support.function.echo.shell
+//        ^^^^ meta.block.groovy meta.string.embedded-shell.groovy string.quoted.single.block.groovy source.shell.bash meta.function-call.identifier.shell support.function.shell
 //                    ^ meta.interpolation.parameter.shell punctuation.definition.variable.shell
 //                     ^ meta.interpolation.parameter.shell punctuation.section.interpolation.begin.shell
 //                      ^^^^^ meta.interpolation.parameter.shell variable.other.readwrite.shell

Makefile/Makefile Shell.sublime-syntax → Makefile/Embeddings/Shell (for Makefile).sublime-syntax

@@ -8,8 +8,7 @@ extends: Packages/ShellScript/Shell-Unix-Generic.sublime-syntax
 
 contexts:
 
-  expansions-parameter:
-    - meta_prepend: true
+  parameter-expansions:
     - include: Packages/Makefile/Makefile.sublime-syntax#variable-substitutions
 
   string-prototype:

Makefile/Makefile.sublime-syntax

@@ -314,7 +314,7 @@ contexts:
     - include: shell-content
 
   shell-content:
-    - include: Packages/Makefile/Makefile Shell.sublime-syntax
+    - include: Packages/Makefile/Embeddings/Shell (for Makefile).sublime-syntax
       apply_prototype: true
 
   line-continuation:
@@ -660,13 +660,13 @@ contexts:
     - match: \$(?=\$[{\w])
       scope: constant.character.escape.makefile
       push:
-        - include: scope:source.shell.bash#expansions-parameter
+        - include: scope:source.shell.bash#parameter-expansions
         - match: ''
           pop: 1
     - match: \$(?=\$\()
       scope: constant.character.escape.makefile
       push:
-        - include: scope:source.shell.embedded.makefile#expansions-command
+        - include: scope:source.shell.embedded.makefile#command-expansions
         - match: ''
           pop: 1
     - match: (\$)[[:alpha:]]

Makefile/syntax_test_makefile.mak

@@ -1001,7 +1001,7 @@ TESTTOOL = sh -c '\
   fi' TESTTOOL
 # ^^^ meta.string.makefile meta.interpolation.makefile
 #    ^^^^^^^^^ meta.string.makefile string.unquoted.makefile - meta.interpolation
-# ^^ source.shell.embedded keyword.control.conditional.end.shell - source.shell source.shell
+# ^^ source.shell.embedded keyword.control.conditional.endif.shell - source.shell source.shell
 #   ^ punctuation.section.interpolation.end.makefile
 
 
@@ -1021,23 +1021,23 @@ html:
 shell_string_interpolation:
     var1="double nquoted $(string) value"
     #    ^^^^^^^^^^^^^^^^ string.quoted.double.shell
-    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.shell
+    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.glob.shell
     #                    ^^^^^^^^^ meta.interpolation
     #                    ^^ keyword.other.block.begin.makefile
     #                      ^^^^^^ variable.parameter.makefile
     #                            ^ keyword.other.block.end.makefile
     #                             ^^^^^^^ string.quoted.double.shell
     var1='single nquoted $(string) value'
     #    ^^^^^^^^^^^^^^^^ string.quoted.single.shell
-    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.shell
+    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.glob.shell
     #                    ^^^^^^^^^ meta.interpolation
     #                    ^^ keyword.other.block.begin.makefile
     #                      ^^^^^^ variable.parameter.makefile
     #                            ^ keyword.other.block.end.makefile
     #                             ^^^^^^^ string.quoted.single.shell
     var1=unquoted\ $(string)\ value
     #    ^^^^^^^^^^ string.unquoted.shell
-    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.shell
+    #    ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.body.makefile source.shell.embedded.makefile meta.string.glob.shell
     #              ^^^^^^^^^ meta.interpolation
     #              ^^ keyword.other.block.begin.makefile
     #                ^^^^^^ variable.parameter.makefile
@@ -1059,13 +1059,13 @@ foo:
 	#   ^ constant.character.escape.makefile
 	#    ^ punctuation
 	#     ^ punctuation.section.interpolation.begin.shell
-	#      ^^^^ support.function.echo.shell
+	#      ^^^^ support.function.shell
 	#           ^ constant.character.escape.makefile
 	#            ^ punctuation.definition.variable.shell
-	#            ^^^^^ variable.other.readwrite.shell
+	#            ^^^^^ variable.language.builtin.shell
 
 	test "$$abc" = "$$def"
-	# ^ support.function.test.shell
+	# ^ support.function.shell
 	#    ^^^^^^^ string.quoted.double.shell
 	#     ^ constant.character.escape.makefile
 	#      ^ punctuation.definition.variable.shell

Markdown/Embeddings/Bash (for Markdown).sublime-syntax

@@ -0,0 +1,41 @@
+%YAML 1.2
+---
+scope: source.shell.bash.embedded.markdown
+version: 2
+hidden: true
+
+extends: Packages/ShellScript/Bash.sublime-syntax
+
+contexts:
+  main:
+    - meta_include_prototype: false
+    # found shebang => normal script
+    - match: ^(?=\s*#!)
+      set: [statements, shebang]
+    # first non-comment line starts with `$` => interactive shell
+    - match: ^(?=\s*\$\s)
+      set: shell-interactive
+    # some script without shebang
+    - match: ^(?=\s*[^#])
+      set: statements
+    - include: comments
+
+  shell-interactive:
+    - match: ^\s*(\$)(?=\s)
+      captures:
+        1: comment.other.shell
+      embed: statements
+      escape: '{{no_escape_behind}}\n'
+
+  line-continuation-body:
+    - meta_prepend: true
+    # continuation line of interactive shells begin with `> `
+    - match: ^\s*(>)\s
+      captures:
+        1: comment.other.shell
+      pop: 1
+
+variables:
+  # lazy escaping from heredoc as shell maybe indented
+  no_indent: ^\s*
+  tab_indent: ^\s*

Markdown/Embeddings/Zsh (for Markdown).sublime-syntax

@@ -0,0 +1,9 @@
+%YAML 1.2
+---
+scope: source.shell.zsh.embedded.markdown
+version: 2
+hidden: true
+
+extends:
+  - Bash (for Markdown).sublime-syntax
+  - Packages/ShellScript/Zsh.sublime-syntax

Markdown/Markdown.sublime-syntax

@@ -1128,7 +1128,6 @@ contexts:
     - include: fenced-rust
     - include: fenced-scala
     - include: fenced-shell
-    - include: fenced-shell-script
     - include: fenced-sql
     - include: fenced-tsx
     - include: fenced-typescript
@@ -1931,43 +1930,41 @@ contexts:
     - match: |-
          (?x)
           {{fenced_code_block_start}}
-          (?i:\s*(console|shell))
+          (?i:\s*(console|bash|shell(?:-script)?|sh))
           {{fenced_code_block_trailing_infostring_characters}}
       captures:
         0: meta.code-fence.definition.begin.shell.markdown-gfm
         2: punctuation.definition.raw.code-fence.begin.markdown
         5: constant.other.language-name.markdown
         6: comment.line.infostring.markdown
         7: meta.fold.code-fence.begin.markdown
-      embed: scope:source.shell.interactive.markdown
+      embed: scope:source.shell.bash.embedded.markdown
       embed_scope:
         markup.raw.code-fence.shell.markdown-gfm
-        source.shell.interactive.markdown
+        source.shell.bash.embedded.markdown
       escape: '{{fenced_code_block_escape}}'
       escape_captures:
         0: meta.code-fence.definition.end.shell.markdown-gfm
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown
-
-  fenced-shell-script:
     - match: |-
          (?x)
           {{fenced_code_block_start}}
-          (?i:\s*(shell-script|sh|bash|zsh))
+          (?i:\s*(zsh))
           {{fenced_code_block_trailing_infostring_characters}}
       captures:
-        0: meta.code-fence.definition.begin.shell-script.markdown-gfm
+        0: meta.code-fence.definition.begin.shell.markdown-gfm
         2: punctuation.definition.raw.code-fence.begin.markdown
         5: constant.other.language-name.markdown
         6: comment.line.infostring.markdown
         7: meta.fold.code-fence.begin.markdown
-      embed: scope:source.shell.bash
+      embed: scope:source.shell.zsh.embedded.markdown
       embed_scope:
-        markup.raw.code-fence.shell-script.markdown-gfm
-        source.shell.bash
+        markup.raw.code-fence.shell.markdown-gfm
+        source.shell.zsh.embedded.markdown
       escape: '{{fenced_code_block_escape}}'
       escape_captures:
-        0: meta.code-fence.definition.end.shell-script.markdown-gfm
+        0: meta.code-fence.definition.end.shell.markdown-gfm
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown