Continue some meta scopes thru line end

To support autocomplete at EOL
robballou · May 15, 2020 · 2a26224 · 2a26224
1 parent 99edfc9
commit 2a26224
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/SSH Config.sublime-syntax b/SSH Config.sublime-syntax
@@ -36,6 +36,11 @@ contexts:
     - match: (?=^[ \t]*(?i:host|match)\b)
       pop: true
 
+  pop-nl-as-value:
+    - match: \n
+      scope: meta.mapping.value.ssh_config
+      pop: true
+
   # Host
   host:
     - match: ^[ \t]*((?i:host))\b
@@ -63,7 +68,7 @@ contexts:
 
   match-conditions:
     - meta_content_scope: meta.block.match.ssh_config meta.statement.conditional.ssh_config
-    - match: (?=\n)
+    - match: \n
       set: match-body
 
     - match: '!'
@@ -168,7 +173,7 @@ contexts:
           scope: constant.language.set.ssh_config
           pop: true
         - include: scope:source.shell
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
 
   localcommand:
     - match: ^\s*((?i:localcommand))\b[ \t]*(=)?
@@ -184,7 +189,7 @@ contexts:
           scope: constant.language.set.ssh_config
           pop: true
         - include: scope:source.shell
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
 
   boolean-value:
     - match: \b(?i:yes|no)\b
@@ -218,7 +223,7 @@ contexts:
         2: keyword.operator.assignment.ssh_config
       push:
         - meta_content_scope: meta.mapping.value.ssh_config
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
         - match: '[ \t]+\S+'
           scope: invalid.illegal.ssh_config
         - include: boolean-value-with-typing
@@ -233,7 +238,7 @@ contexts:
         2: keyword.operator.assignment.ssh_config
       push:
         - meta_content_scope: meta.mapping.value.ssh_config
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
         - match: '[ \t]+\S+'
           scope: invalid.illegal.ssh_config
         - include: boolean-value-with-typing
@@ -271,7 +276,7 @@ contexts:
             - meta_content_scope: string.unquoted.ssh_config
             - include: SSH Common.sublime-syntax#pop-before-nl
             - include: generic-option-includes
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
 
   generic-option-includes:
     - include: tokens

diff --git a/SSHD Config.sublime-syntax b/SSHD Config.sublime-syntax
@@ -65,7 +65,12 @@ contexts:
     - match: (?=^[ \t]*(?i:match)\b)
       pop: true
 
-  # Match
+  pop-nl-as-value:
+    - match: \n
+      scope: meta.mapping.value.ssh_config
+      pop: true
+
+ # Match
   match:
     - match: ^[ \t]*((?i:match))\b
       captures:
@@ -74,7 +79,7 @@ contexts:
 
   match-conditions:
     - meta_content_scope: meta.block.match.sshd_config meta.statement.conditional.sshd_config
-    - match: (?=\n)
+    - match: \n
       set: match-body
 
     - match: '!'
@@ -134,7 +139,7 @@ contexts:
           scope: constant.language.set.sshd_config
           pop: true
         - include: scope:source.shell
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
 
   generic-option:
     - match: ^\s*([a-zA-Z1]+)\b[ \t]*(=)?
@@ -160,7 +165,7 @@ contexts:
             - meta_content_scope: string.unquoted.sshd_config
             - include: SSH Common.sublime-syntax#pop-before-nl
             - include: generic-option-value
-        - include: SSH Common.sublime-syntax#pop-nl
+        - include: pop-nl-as-value
 
   generic-option-value:
     - match: \b(?i:yes|no)\b

diff --git a/Tests/syntax_test_client.ssh_config b/Tests/syntax_test_client.ssh_config
@@ -2,7 +2,7 @@
 
 Match Host targ?t_host Exec not_inside_network User sue
 # ^^^ keyword.control.conditional
-#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional
 #     ^^^^             keyword.other
 #          ^^^^^^^^^^^ entity.name.label.host-alias
 #              ^       keyword.operator.wildcard
@@ -12,8 +12,8 @@ Match Host targ?t_host Exec not_inside_network User sue
 #                                             ^ - source.embedded.shell
 #                                              ^^^^     keyword.other
 #                                                   ^^^ string.unquoted
-#                                                      ^ - meta.statement
     ProxyCommand ssh -W %h:%p proxy_server
+#<- - meta.statement
     # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.match
     # ^^^^^^^^^^                             keyword.other
     #            ^^^^^^^^^^^^^^^^^^^^^^^^^   source.embedded.shell

diff --git a/Tests/syntax_test_server.sshd_config b/Tests/syntax_test_server.sshd_config
@@ -143,7 +143,7 @@ Match User username1,username2 Address 192.168.0.0/16
 Match User username1,username2 Address *,!192.168.0.0/16
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - meta.block.match meta.block.match
 #^^^^ meta.block.match keyword.control.conditional
-#    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional
+#    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.statement.conditional
 #     ^^^^ keyword.other
 #          ^^^^^^^^^^^^^^^^^^^ string.unquoted
 #                   ^ punctuation.separator.sequence