tree-sitter-ssh-client-config 2023.2.16 → 2023.3.21

package/binding.gyp

@@ -1,7 +1,7 @@
 {
   "targets": [
     {
-      "target_name": "tree_sitter_sshclientconfig_binding",
+      "target_name": "tree_sitter_ssh_client_config_binding",
       "include_dirs": [
         "<!(node -e \"require('nan')\")",
         "src"

package/bindings/node/binding.cc

@@ -4,7 +4,7 @@
 
 using namespace v8;
 
-extern "C" TSLanguage * tree_sitter_sshclientconfig();
+extern "C" TSLanguage * tree_sitter_ssh_client_config();
 
 namespace {
 
@@ -17,12 +17,12 @@ void Init(Local<Object> exports, Local<Object> module) {
 
   Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
   Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_sshclientconfig());
+  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_ssh_client_config());
 
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("sshclientconfig").ToLocalChecked());
+  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("ssh-client-config").ToLocalChecked());
   Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
-NODE_MODULE(tree_sitter_sshclientconfig_binding, Init)
+NODE_MODULE(tree_sitter_ssh_client_config_binding, Init)
 
 }  // namespace

package/bindings/node/index.js

@@ -1,11 +1,11 @@
 try {
-  module.exports = require("../../build/Release/tree_sitter_sshclientconfig_binding");
+  module.exports = require("../../build/Release/tree_sitter_ssh_client_config_binding");
 } catch (error1) {
   if (error1.code !== 'MODULE_NOT_FOUND') {
     throw error1;
   }
   try {
-    module.exports = require("../../build/Debug/tree_sitter_sshclientconfig_binding");
+    module.exports = require("../../build/Debug/tree_sitter_ssh_client_config_binding");
   } catch (error2) {
     if (error2.code !== 'MODULE_NOT_FOUND') {
       throw error2;

package/grammar.js

@@ -1,5 +1,5 @@
 module.exports = grammar({
-  name: 'sshclientconfig',
+  name: 'ssh_client_config',
 
   extras: $ => [
     $.comment,
@@ -36,6 +36,7 @@ module.exports = grammar({
         $.control_path,
         $.control_persist,
         $.dynamic_forward,
+        $.enable_escape_commandline,
         $.enable_ssh_keysign,
         $.escape_char,
         $.exit_on_forward_failure,
@@ -314,6 +315,12 @@ module.exports = grammar({
     ),
     dynamic_forward_value: $ => /\S.*/,
 
+    enable_escape_commandline: $ => option(
+        'EnableEscapeCommandline',
+        $.enable_escape_commandline_value
+    ),
+    enable_escape_commandline_value: $ => alias($.boolean, "enable_escape_commandline_value"),
+
     enable_ssh_keysign: $ => option(
         'EnableSSHKeysign',
         $.enable_ssh_keysign_value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-ssh-client-config",
-  "version": "2023.2.16",
+  "version": "2023.3.21",
   "description": "tree-sitter grammar for SSH client configuration files",
   "keywords": [
     "parser",
@@ -24,16 +24,16 @@
   },
   "author": {
     "name": "Sebastian Hoß",
-    "email": "seb@hoß.de",
-    "url": "https://seb.people.metio.wtf/"
+    "email": "seb@xn--ho-hia.de",
+    "url": "https://seb.xn--ho-hia.de/"
   },
   "contributors": [],
   "license": "CC0-1.0",
   "dependencies": {
-    "nan": "^2.17.0"
+    "nan": "2.17.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.7"
+    "tree-sitter-cli": "0.20.7"
   },
   "tree-sitter": [
     {

package/queries/highlights.scm

@@ -78,6 +78,9 @@
 (dynamic_forward) @keyword
 (dynamic_forward_value) @string
 
+(enable_escape_commandline) @keyword
+(enable_escape_commandline_value) @constant.builtin.boolean
+
 (enable_ssh_keysign) @keyword
 (enable_ssh_keysign_value) @constant.builtin.boolean
 

package/src/grammar.json

@@ -1,5 +1,5 @@
 {
-  "name": "sshclientconfig",
+  "name": "ssh_client_config",
   "rules": {
     "client_config": {
       "type": "REPEAT",
@@ -115,6 +115,10 @@
           "type": "SYMBOL",
           "name": "dynamic_forward"
         },
+        {
+          "type": "SYMBOL",
+          "name": "enable_escape_commandline"
+        },
         {
           "type": "SYMBOL",
           "name": "enable_ssh_keysign"
@@ -2666,6 +2670,89 @@
       "type": "PATTERN",
       "value": "\\S.*"
     },
+    "enable_escape_commandline": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 1,
+              "content": {
+                "type": "PATTERN",
+                "value": "[eE][nN][aA][bB][lL][eE][eE][sS][cC][aA][pP][eE][cC][oO][mM][mM][aA][nN][dD][lL][iI][nN][eE]"
+              }
+            }
+          },
+          "named": false,
+          "value": "EnableEscapeCommandline"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "PATTERN",
+              "value": "[ \\t]"
+            },
+            {
+              "type": "STRING",
+              "value": "="
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "="
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\""
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "enable_escape_commandline_value"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "\""
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "enable_escape_commandline_value": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "boolean"
+      },
+      "named": false,
+      "value": "enable_escape_commandline_value"
+    },
     "enable_ssh_keysign": {
       "type": "SEQ",
       "members": [

package/src/node-types.json

@@ -443,6 +443,10 @@
           "type": "dynamic_forward",
           "named": true
         },
+        {
+          "type": "enable_escape_commandline",
+          "named": true
+        },
         {
           "type": "enable_ssh_keysign",
           "named": true
@@ -930,6 +934,26 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "enable_escape_commandline",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "enable_escape_commandline_value",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "enable_escape_commandline_value",
+    "named": false,
+    "fields": {}
+  },
   {
     "type": "enable_ssh_keysign",
     "named": true,
@@ -2770,6 +2794,10 @@
     "type": "DynamicForward",
     "named": false
   },
+  {
+    "type": "EnableEscapeCommandline",
+    "named": false
+  },
   {
     "type": "EnableSSHKeysign",
     "named": false