tree-sitter-familymarkup 1.10.0 → 1.11.0

package/grammar.js

@@ -36,7 +36,7 @@ module.exports = grammar({
 
     relation: $ => seq(
       field('sources', $.sources),
-      field('arrow', $._arrows),
+      field('arrow', choice($.eq, $.arrow)),
       field('label', optional($.words)),
       optional($._nl),
       field('targets', optional($.targets)),
@@ -86,7 +86,9 @@ module.exports = grammar({
     words: _ => /\p{Ll}([\p{Ll}'"\s]*[\p{Ll}'"])?/u,
     _words: $ => alias($.words, '_words'),
 
-    _arrows: _ => choice('=', '<->', '->', '<-', '-'),
+    eq: _ => "=",
+
+    arrow: _ => choice('<->', '->', '<-', '-'),
   },
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tree-sitter-familymarkup",
   "description": "Tree sitter for FamilyMarkup",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "main": "bindings/node",
   "types": "bindings/node",
   "scripts": {

package/queries/highlights.scm

@@ -21,7 +21,8 @@
 )
 
 (relation
-  arrow: "="
+  (sources)
+  (eq)
   (targets
     (name_def
       (new_surname

package/queries.json

@@ -1,3 +1,3 @@
 {
-  "highlights": "(family_name\n  (name) @class.declaration.family_name\n\n  (name_aliases\n    (name) @class.declaration.family_name.alias\n  )?\n)\n\n(name_ref\n  (name) @property.static.name.ref\n  (surname) @class.family_name.ref\n)\n\n(name_def\n  (name) @property.static.name.ref\n  (surname)? @class.family_name.ref\n)\n\n(sources\n  (name) @property.static.name.ref\n)\n\n(relation\n  arrow: \"=\"\n  (targets\n    (name_def\n      (new_surname\n        (name) @class.family_name.ref\n      )?\n      (name) @property.declaration.static.name.def\n      (name_aliases\n        (name) @property.declaration.static.name.def.alias\n      )?\n      (surname)? @class.family_name.ref\n    )\n  )\n)\n\n(unknown) @string.unknown\n\n(comment) @comment\n\n(num) @number.targets\n\n(sources delimiter: _ @punctuation.delimiter.sources)\n(targets delimiter: _ @punctuation.delimiter.targets)\n\n\"+\" @operator.sources.join\n\n(relation arrow: _ @operator.arrow)\n\n(relation label: _ @string.label)\n"
+  "highlights": "(family_name\n  (name) @class.declaration.family_name\n\n  (name_aliases\n    (name) @class.declaration.family_name.alias\n  )?\n)\n\n(name_ref\n  (name) @property.static.name.ref\n  (surname) @class.family_name.ref\n)\n\n(name_def\n  (name) @property.static.name.ref\n  (surname)? @class.family_name.ref\n)\n\n(sources\n  (name) @property.static.name.ref\n)\n\n(relation\n  (sources)\n  (eq)\n  (targets\n    (name_def\n      (new_surname\n        (name) @class.family_name.ref\n      )?\n      (name) @property.declaration.static.name.def\n      (name_aliases\n        (name) @property.declaration.static.name.def.alias\n      )?\n      (surname)? @class.family_name.ref\n    )\n  )\n)\n\n(unknown) @string.unknown\n\n(comment) @comment\n\n(num) @number.targets\n\n(sources delimiter: _ @punctuation.delimiter.sources)\n(targets delimiter: _ @punctuation.delimiter.targets)\n\n\"+\" @operator.sources.join\n\n(relation arrow: _ @operator.arrow)\n\n(relation label: _ @string.label)\n"
 }

package/src/grammar.json

@@ -222,8 +222,17 @@
           "type": "FIELD",
           "name": "arrow",
           "content": {
-            "type": "SYMBOL",
-            "name": "_arrows"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "eq"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "arrow"
+              }
+            ]
           }
         },
         {
@@ -716,13 +725,13 @@
       "named": false,
       "value": "_words"
     },
-    "_arrows": {
+    "eq": {
+      "type": "STRING",
+      "value": "="
+    },
+    "arrow": {
       "type": "CHOICE",
       "members": [
-        {
-          "type": "STRING",
-          "value": "="
-        },
         {
           "type": "STRING",
           "value": "<->"

package/src/node-types.json

@@ -1,4 +1,9 @@
 [
+  {
+    "type": "arrow",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "comment",
     "named": true,
@@ -187,24 +192,12 @@
         "required": true,
         "types": [
           {
-            "type": "-",
-            "named": false
-          },
-          {
-            "type": "->",
-            "named": false
-          },
-          {
-            "type": "<-",
-            "named": false
-          },
-          {
-            "type": "<->",
-            "named": false
+            "type": "arrow",
+            "named": true
           },
           {
-            "type": "=",
-            "named": false
+            "type": "eq",
+            "named": true
           }
         ]
       },
@@ -404,10 +397,6 @@
     "type": "<->",
     "named": false
   },
-  {
-    "type": "=",
-    "named": false
-  },
   {
     "type": "?",
     "named": false
@@ -416,6 +405,10 @@
     "type": "_words",
     "named": false
   },
+  {
+    "type": "eq",
+    "named": true
+  },
   {
     "type": "name",
     "named": true