Centralize string patterns context

Author: michaelblyons

SSH Common.sublime-syntax

@@ -193,6 +193,28 @@ contexts:
         - include: pop-before-nl
     - include: pop-nl
 
+  string-patterns:
+    # https://man7.org/linux/man-pages/man5/ssh_config.5.html#PATTERNS
+    # https://man.openbsd.org/ssh_config.5#PATTERNS
+    # https://man7.org/linux/man-pages/man5/sshd_config.5.html#PATTERNS
+    # https://man.openbsd.org/sshd_config.5#PATTERNS
+    - include: punctuation-comma-sequence
+    - include: operator-exclamation
+    - match: '"'
+      scope: punctuation.definition.string.begin.ssh.common
+      push:
+        - meta_content_scope: string.quoted.double.ssh.common
+        - match: '"'
+          scope: punctuation.definition.string.end.ssh.common
+          pop: 1
+        - include: wildcards
+    - match: (?=\S)
+      push:
+        - meta_content_scope: string.unquoted.ssh.common
+        - match: (?=[,!\s])
+          pop: 1
+        - include: wildcards
+
   paths:
     # This is just heuristic. Expect failures.
     - match: (?=~?[\w.\-?*${}%]*/[\w.\-?*${}%]?)

SSH Config.sublime-syntax

@@ -145,20 +145,7 @@ contexts:
       scope: keyword.other.ssh_config
       push:
         - include: pop-before-match-parameter
-        - match: '"'
-          scope: punctuation.definition.string.begin.ssh_config
-          push:
-            - meta_scope: meta.string.ssh_config string.quoted.double.ssh_config
-            - match: '"'
-              scope: punctuation.definition.string.end.ssh_config
-              pop: 1
-            - include: wildcards
-        - match: (?=\S)
-          push:
-            - meta_scope: string.unquoted.ssh_config
-            - match: (?=\s)
-              pop: 1
-            - include: wildcards
+        - include: string-patterns
 
     # Match predicates with CIDR arguments
     - match: '\b(?xi: localnetwork )\b'

SSHD Config.sublime-syntax

@@ -130,18 +130,6 @@ contexts:
     - include: pop-before-next-match
     - include: parameters
 
-  string-patterns:
-    # https://man7.org/linux/man-pages/man5/sshd_config.5.html#PATTERNS
-    # https://man.openbsd.org/ssh_config.5#PATTERNS
-    - include: punctuation-comma-sequence
-    - include: operator-exclamation
-    - match: (?=\S)
-      push:
-        - meta_content_scope: string.unquoted.sshd_config
-        - match: (?=[,!\s])
-          pop: 1
-        - include: wildcards
-
 ###[ PARAMETERS ]##############################################################
 
   parameter-forcecommand:

Tests/syntax_test_client.ssh_config

@@ -23,7 +23,7 @@ Match Version Op?nSSH_10.0
 #^^^^ keyword.control.conditional.ssh_config
 #    ^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional.ssh_config
 #     ^^^^^^^ keyword.other.ssh_config
-#             ^^^^^^^^^^^^ string.unquoted.ssh_config
+#             ^^^^^^^^^^^^ string.unquoted.ssh.common
 #               ^ constant.other.wildcard.questionmark.ssh.common
 
 
@@ -38,7 +38,7 @@ Match Host targ?t_host Exec not_inside_network User sue
 #                      ^^^^ keyword.other.ssh_config
 #                           ^^^^^^^^^^^^^^^^^^ source.shell.embedded.ssh source.shell.bash variable.function.shell
 #                                              ^^^^ keyword.other.ssh_config
-#                                                   ^^^ string.unquoted.ssh_config
+#                                                   ^^^ string.unquoted.ssh.common
 #          @@@@@@@@@@@ local-definition "Alias: targ?t_host"
 #                           @@@@@@@@@@@@@@@@@@ reference
     ProxyCommand ssh -W %h:%p proxy_server

Tests/syntax_test_server.sshd_config

@@ -155,16 +155,16 @@ Match User *,!username1,!usern.ame2 Host foo.example.com
 #    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional.sshd_config
 #     ^^^^ meta.mapping.key.sshd_config keyword.other.sshd_config
 #         ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.sshd_config
-#          ^ string.unquoted.sshd_config constant.other.wildcard.asterisk.ssh.common
+#          ^ string.unquoted.ssh.common constant.other.wildcard.asterisk.ssh.common
 #           ^ punctuation.separator.sequence.ssh.common
 #            ^ keyword.operator.logical.ssh.common
-#             ^^^^^^^^^ string.unquoted.sshd_config
+#             ^^^^^^^^^ string.unquoted.ssh.common
 #                      ^ punctuation.separator.sequence.ssh.common
 #                       ^ keyword.operator.logical.ssh.common
-#                        ^^^^^^^^^^ string.unquoted.sshd_config - punctuation
+#                        ^^^^^^^^^^ string.unquoted.ssh.common - punctuation
 #                                   ^^^^ meta.mapping.key.sshd_config keyword.other.sshd_config
 #                                       ^^^^^^^^^^^^^^^^ meta.mapping.value.sshd_config
-#                                        ^^^^^^^^^^^^^^^ string.unquoted.sshd_config
+#                                        ^^^^^^^^^^^^^^^ string.unquoted.ssh.common
 #                                           ^ punctuation.separator.sequence.ssh.common
 #                                                   ^ punctuation.separator.sequence.ssh.common
     PasswordAuthentication yes