Improve ProxyJump parameter parsing

tree-sitter-grammars · Nov 17, 2023 · 1651e63 · 1651e63
1 parent 5b0ac6d
commit 1651e63
Show file tree

Hide file tree

Showing 5 changed files with 12,517 additions and 12,247 deletions.
diff --git a/grammar.js b/grammar.js
@@ -24,7 +24,6 @@ module.exports = grammar({
     $._identity_agent_arg,
     $._ipqos_arg,
     $._proxy_command_arg,
-    $._proxy_jump_arg,
     $._request_tty_arg,
     $._security_key_provider_arg,
     $._strict_host_key_checking_arg,
@@ -761,17 +760,17 @@ module.exports = grammar({
     _proxy_jump: $ => seq(
       u.keyword('ProxyJump'),
       $._sep,
-      u.argument($._proxy_jump_arg)
+      u.list(',', u.argument($._proxy_jump_value))
     ),
 
-    _proxy_jump_arg: $ => choice(
+    _proxy_jump_value: $ => choice(
       'none',
       seq(
         optional(seq(
-          field('user', alias(/\S+/, $.string)),
+          field('user', alias(/[\w+-]+/, $.string)),
           '@'
         )),
-        field('host', alias(/\S+/, $.string)),
+        field('host', alias(/[\w.+-]+/, $.string)),
         optional(seq(
           ':',
           field('port', $.number)

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json