feat: distinguish keys as @field

tree-sitter-grammars · May 13, 2023 · 06bbf2e · 06bbf2e
1 parent 6e245b4
commit 06bbf2e
Show file tree

Hide file tree

Showing 8 changed files with 513 additions and 568 deletions.
diff --git a/bindings/node/binding.cc b/bindings/node/binding.cc
@@ -11,18 +11,18 @@ namespace {
 NAN_METHOD(New) {}
 
 void Init(Local<Object> exports, Local<Object> module) {
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance =
-      constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_cpon());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(),
-           Nan::New("cpon").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+    Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
+    tpl->SetClassName(Nan::New("Language").ToLocalChecked());
+    tpl->InstanceTemplate()->SetInternalFieldCount(1);
+
+    Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
+    Local<Object>   instance =
+        constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+    Nan::SetInternalFieldPointer(instance, 0, tree_sitter_cpon());
+
+    Nan::Set(instance, Nan::New("name").ToLocalChecked(),
+             Nan::New("cpon").ToLocalChecked());
+    Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
 NODE_MODULE(tree_sitter_cpon, Init)

diff --git a/grammar.js b/grammar.js
@@ -41,11 +41,9 @@ module.exports = grammar({
       ),
     ),
 
-    meta_map: $ => seq(
-      '<', optionalCommaSep($._meta_pair), '>',
-    ),
+    meta_map: $ => seq('<', optionalCommaSep($.meta_pair), '>'),
 
-    _meta_pair: $ => seq(
+    meta_pair: $ => seq(
       field('key', choice($.string, $.number, $.float)),
       ':',
       field('value', $._value),

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -15,6 +15,8 @@
   "d" @character.special
   (_) @string.special)
 
+(_ key: (_) @label)
+
 (number) @number
 
 (float) @float

diff --git a/src/grammar.json b/src/grammar.json
@@ -86,7 +86,7 @@
               "members": [
                 {
                   "type": "SYMBOL",
-                  "name": "_meta_pair"
+                  "name": "meta_pair"
                 },
                 {
                   "type": "REPEAT",
@@ -102,7 +102,7 @@
                       },
                       {
                         "type": "SYMBOL",
-                        "name": "_meta_pair"
+                        "name": "meta_pair"
                       }
                     ]
                   }
@@ -127,7 +127,7 @@
         }
       ]
     },
-    "_meta_pair": {
+    "meta_pair": {
       "type": "SEQ",
       "members": [
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -258,10 +258,25 @@
   {
     "type": "meta_map",
     "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "meta_pair",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "meta_pair",
+    "named": true,
     "fields": {
       "key": {
-        "multiple": true,
-        "required": false,
+        "multiple": false,
+        "required": true,
         "types": [
           {
             "type": "float",
@@ -279,7 +294,7 @@
       },
       "value": {
         "multiple": true,
-        "required": false,
+        "required": true,
         "types": [
           {
             "type": "array",