[ShellScript] Refine pattern matching contexts

This commit ...

1. introduce a `pattern-common` context for common patterns,
   which are valid in all sorts and locations of patterns.

2. modifies how `meta.group.regexp` is applied to reduce requirement of
   duplicated scope names in punctuation patterns.

ShellScript/Bash.sublime-syntax

@@ -2259,32 +2259,36 @@ contexts:
  - include: eol-pop
 
  pattern-groups:
- - match: ([?*+@!])(\()
- captures:
- 1: string.unquoted.shell keyword.operator.quantifier.regexp.shell
- 2: meta.group.regexp.shell string.unquoted.shell punctuation.section.group.begin.regexp.shell
- push: pattern-group-body
+ - match: '[?*+@!](?=\()'
+ scope: keyword.operator.quantifier.regexp.shell
+ push: pattern-group
+
+ pattern-group:
+ - meta_include_prototype: false
+ - match: \(
+ scope: punctuation.section.group.begin.regexp.shell
+ set: pattern-group-body
 
  pattern-group-body:
  - clear_scopes: 1 # clear `string.unquoted`
  - meta_include_prototype: false
- - meta_content_scope: meta.group.regexp.shell string.unquoted.shell
+ - meta_scope: meta.group.regexp.shell string.unquoted.shell
  - include: pattern-group-end
  - include: pattern-group-content
 
- pattern-group-content:
- - include: string-unquoted-content
- - include: pattern-groups
- - include: pattern-group-charsets
- - include: pattern-operators
- - include: pattern-wildcards
-
  pattern-group-end:
  - match: \)
- scope: meta.group.regexp.shell string.unquoted.shell punctuation.section.group.end.regexp.shell
+ scope: punctuation.section.group.end.regexp.shell
  pop: 1
  - include: line-continuations
 
+ pattern-group-content:
+ - include: string-unquoted-content
+ - include: pattern-groups
+ - include: pattern-group-charsets
+ - include: pattern-group-operators
+ - include: pattern-common
+
  pattern-group-charsets:
  - match: (?=\[)
  branch_point: pattern-group-charset
@@ -2308,11 +2312,11 @@ contexts:
  - include: pattern-charset-end
  - include: pattern-charset-content
 
- pattern-operators:
+ pattern-group-operators:
  - match: \|
  scope: keyword.operator.logical.regexp.shell
 
- pattern-wildcards:
+ pattern-common:
  - match: \*
  scope: constant.other.wildcard.asterisk.shell
  - match: \?
@@ -2439,7 +2443,7 @@ contexts:
  expansions-patterns:
  - include: pattern-groups
  - include: pattern-charsets
- - include: pattern-wildcards
+ - include: pattern-common
 
  expansions-variables:
  - include: expansions-arithmetic
@@ -2764,7 +2768,7 @@ contexts:
  - include: string-unquoted-content
  - include: expansion-parameter-pattern-charsets
  - include: expansion-parameter-pattern-groups
- - include: pattern-wildcards
+ - include: pattern-common
 
  expansion-parameter-pattern-charsets:
  - match: (?=\[)
@@ -2790,22 +2794,26 @@ contexts:
  - include: pattern-charset-content
 
  expansion-parameter-pattern-groups:
- - match: ([?*+@!])(\()
- captures:
- 1: string.unquoted.shell keyword.operator.quantifier.regexp.shell
- 2: meta.group.regexp.shell string.unquoted.shell punctuation.section.group.begin.regexp.shell
- push: expansion-parameter-pattern-group-body
+ - match: '[?*+@!]?(?=\()'
+ scope: keyword.operator.quantifier.regexp.shell
+ push: expansion-parameter-pattern-group
+
+ expansion-parameter-pattern-group:
+ - meta_include_prototype: false
+ - match: \(
+ scope: punctuation.section.group.begin.regexp.shell
+ set: expansion-parameter-pattern-group-body
 
  expansion-parameter-pattern-group-body:
  - clear_scopes: 1 # clear `string.unquoted`
  - meta_include_prototype: false
- - meta_content_scope: meta.group.regexp.shell string.unquoted.shell
+ - meta_scope: meta.group.regexp.shell string.unquoted.shell
  - include: pattern-group-end
  - include: string-unquoted-content
  - include: expansion-parameter-pattern-groups
  - include: expansion-parameter-pattern-group-charsets
- - include: pattern-operators
- - include: pattern-wildcards
+ - include: pattern-group-operators
+ - include: pattern-common
  - include: brace-pop
 
  expansion-parameter-pattern-group-charsets:

ShellScript/Zsh.sublime-syntax

@@ -318,60 +318,22 @@ contexts:
  - string-path-pattern-body
  - maybe-tilde-interpolation
 
- string-path-pattern-content:
- - meta_prepend: true
- - include: zsh-glob-flags
- - include: zsh-glob-operators
- - include: zsh-glob-ranges
-
-###[ PATH PATTERN MATCHING ]###################################################
-
- path-pattern-content:
- - meta_prepend: true
- - include: zsh-glob-flags
- - include: zsh-glob-operators
- - include: zsh-glob-ranges
-
 ###[ SHELL PATTERN MATCHING ]##################################################
 
- pattern-main-content:
- - meta_prepend: true
- - include: zsh-glob-flags
- - include: zsh-glob-operators
- - include: zsh-glob-ranges
-
  pattern-groups:
+ - include: zsh-glob-flags
  # prefer EXTENDED_GLOB over optional KSH_GLOB
  - match: (?=\()
- branch_point: pattern-group
+ branch_point: zsh-glob-qualifier
  branch:
  - zsh-glob-qualifier
  - pattern-group
 
- pattern-group:
- - match: \(
- scope: punctuation.section.group.begin.regexp.shell
- set: pattern-group-body
-
- pattern-group-body:
- - clear_scopes: 1 # clear `string.unquoted`
- - meta_include_prototype: false
- - meta_scope: meta.group.regexp.shell string.unquoted.shell
- - include: pattern-group-end
- - include: pattern-group-content
-
- pattern-group-content:
+ pattern-common:
  - meta_prepend: true
- - include: zsh-glob-flags
  - include: zsh-glob-operators
  - include: zsh-glob-ranges
 
- pattern-group-end:
- - match: \)
- scope: punctuation.section.group.end.regexp.shell
- pop: 1
- - include: line-continuations
-
 ###[ ARITHMETIC EXPANSIONS ]###################################################
 
  expansions-arithmetic:
@@ -462,24 +424,13 @@ contexts:
  - expansion-parameter-pattern
  - maybe-tilde-interpolation
 
- expansion-parameter-pattern:
- - meta_prepend: true
- - include: zsh-glob-flags
- - include: zsh-glob-operators
- - include: zsh-glob-ranges
-
  expansion-parameter-pattern-groups:
+ - include: zsh-glob-flags
  # prefer EXTENDED_GLOB over optional KSH_GLOB
  - match: \(
- scope: meta.group.regexp.shell string.unquoted.shell punctuation.section.group.begin.regexp.shell
+ scope: punctuation.section.group.begin.regexp.shell
  push: expansion-parameter-pattern-group-body
 
- expansion-parameter-pattern-group-body:
- - meta_prepend: true
- - include: zsh-glob-flags
- - include: zsh-glob-operators
- - include: zsh-glob-ranges
-
  zsh-parameter-subscription:
  - meta_include_prototype: false
  - meta_scope: meta.interpolation.parameter.shell
@@ -606,11 +557,11 @@ contexts:
  - match: '{{word_break}}'
  pop: 1
  - match: ''
- fail: pattern-group
+ fail: zsh-glob-qualifier
 
  zsh-glob-qualifier-fail:
  - match: (?=\S)
- fail: pattern-group
+ fail: zsh-glob-qualifier
 
  zsh-glob-qualifier-content:
  - include: comma-separators