Fix offering completions in host aliases

Author: michaelblyons

src/crypto.yaml

@@ -7,6 +7,7 @@ key-types:
     scope: "
       (source.ssh_config | source.sshd_config)
         & meta.mapping.value
+        - meta.mapping.value.host-aliases
         - source source,
       (text.authorized_keys | text.known_hosts)
         - comment
@@ -112,6 +113,7 @@ ciphers:
     scope: "
       (source.ssh_config | source.sshd_config)
         & meta.mapping.value
+        - meta.mapping.value.host-aliases
         - source source
       "
     kind: [function, c, Cipher]
@@ -228,6 +230,7 @@ kex-algorithms:
     scope: "
       (source.ssh_config | source.sshd_config)
         & meta.mapping.value
+        - meta.mapping.value.host-aliases
         - source source
       "
     kind: [function, k, Kex Algm]
@@ -368,6 +371,7 @@ mac-algorithms:
     scope: "
       (source.ssh_config | source.sshd_config)
         & meta.mapping.value
+        - meta.mapping.value.host-aliases
         - source source
       "
     kind: [function, m, MAC Algm]

support/Config Values.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - comment - source source",
+    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - meta.mapping.value.host-aliases - comment - source source",
     "completions": [
         {
             "trigger": "yes",

support/SSH host block.sublime-snippet

@@ -7,6 +7,6 @@ Host ${1:hostname}
 
 ]]></content>
 	<tabTrigger>host</tabTrigger>
-	<scope>source.ssh_config</scope>
+	<scope>source.ssh_config - meta.mapping.value - comment</scope>
 	<description>Create new Host entry</description>
 </snippet>

support/SSH match block.sublime-snippet

@@ -5,6 +5,6 @@ Match ${1:conditions}
 
 ]]></content>
 	<tabTrigger>match</tabTrigger>
-	<scope>source.ssh_config</scope>
+	<scope>source.ssh_config - meta.mapping.value - comment</scope>
 	<description>Create new Match entry</description>
 </snippet>

support/generated/ciphers.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - source source",
+    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - meta.mapping.value.host-aliases - source source",
     "completions": [
         {
             "trigger": "AEAD_AES_128_GCM\tcipher",

support/generated/kex-algorithms.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - source source",
+    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - meta.mapping.value.host-aliases - source source",
     "completions": [
         {
             "trigger": "Curve25519SHA256\tkex",

support/generated/key-types.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - source source, (text.authorized_keys | text.known_hosts) - comment - string",
+    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - meta.mapping.value.host-aliases - source source, (text.authorized_keys | text.known_hosts) - comment - string",
     "completions": [
         {
             "trigger": "dsa2048-sha224@libassh.org\tkey type",

support/generated/mac-algorithms.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - source source",
+    "scope": "(source.ssh_config | source.sshd_config) & meta.mapping.value - meta.mapping.value.host-aliases - source source",
     "completions": [
         {
             "trigger": "AEAD_AES_128_GCM\tmac",

syntax/SSH Config.sublime-syntax

@@ -75,17 +75,19 @@ contexts:
   host-block:
     - match: ^\s*((?i:Host))\b
       captures:
-        1: keyword.declaration.host-alias.ssh_config
+        1: meta.mapping.key.ssh_config keyword.declaration.host-alias.ssh_config
       set: host-aliases
 
   host-aliases:
     - meta_scope: meta.block.host.ssh_config
-    - match: (?=\n)
+    - meta_content_scope: meta.mapping.value.host-aliases.ssh_config
+    - match: \n
+      scope: meta.mapping.value.host-aliases.ssh_config
       set: host-body
     - include: host-patterns
 
   host-body:
-    - meta_scope: meta.block.host.ssh_config
+    - meta_content_scope: meta.block.host.ssh_config
     - include: pop-before-next-host
     - include: parameters
 

test/syntax_test_client.ssh_config

@@ -97,16 +97,17 @@ Host tj
 #        ^^^^^^^^^^ meta.mapping.value.ssh.common string.unquoted.ssh.common - meta.number - constant
 
 Host server serverino !other-pat?ern
-#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.host.ssh_config - meta.block.match - meta.block meta.block
-#^^^ keyword.declaration.host-alias.ssh_config
-#   ^                 - entity
-#    ^^^^^^           entity.name.label.host-alias.ssh_config
-#          ^          - entity
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.host.ssh_config - meta.block.match - meta.block meta.block
+#^^^ meta.mapping.key.ssh_config keyword.declaration.host-alias.ssh_config
+#   ^ - entity
+#   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.host-aliases.ssh_config
+#    ^^^^^^ entity.name.label.host-alias.ssh_config
+#          ^ - entity
 #           ^^^^^^^^^ entity.name.label.host-alias.ssh_config
-#                    ^               - entity
-#                     ^              keyword.operator.logical.ssh.common
+#                    ^ - entity
+#                     ^ keyword.operator.logical.ssh.common
 #                      ^^^^^^^^^^^^^ entity.name.label.host-alias.ssh_config
-#                               ^    constant.other.wildcard.questionmark.ssh.common
+#                               ^ constant.other.wildcard.questionmark.ssh.common
 #    @@@@@@ local-definition "Alias: server"
 #           @@@@@@@@@ local-definition "Alias: serverino"
 #                      @@@@@@@@@@@@@ local-definition "Alias: other-pat?ern"