add field for the name of a moduleInstantiation

Co-authored-by: Erik Krogh Kristensen <[email protected]>
tausbn · Jul 14, 2022 · fd62fd9 · fd62fd9
1 parent 980233c
commit fd62fd9
Show file tree

Hide file tree

Showing 6 changed files with 36,220 additions and 35,381 deletions.
diff --git a/grammar.js b/grammar.js
@@ -4,6 +4,7 @@ module.exports = grammar({
   conflicts: $ => [
     [$.simpleId, $.className],
     [$.simpleId, $.literalId],
+    [$.moduleName, $.varName],
     [$.simpleId, $.moduleInstantiation],
     [$.className, $.moduleInstantiation],
   ],
@@ -407,7 +408,7 @@ module.exports = grammar({
     ),
 
     moduleInstantiation: $ => seq(
-      $._upper_id,
+      field("name", $.moduleName),
       "<",
       sep1($.signatureExpr, ","),
       ">"

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "author": "Sam Lanning <[email protected]>",
   "license": "MIT",
   "devDependencies": {
-    "tree-sitter-cli": "^0.19.5"
+    "tree-sitter-cli": "^0.20.6"
   },
   "scripts": {
     "tree-sitter": "tree-sitter",
@@ -42,4 +42,4 @@
     "example": "examples",
     "test": "test"
   }
-}
+}
diff --git a/src/grammar.json b/src/grammar.json
@@ -2962,8 +2962,12 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "_upper_id"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "moduleName"
+          }
         },
         {
           "type": "STRING",
@@ -3310,6 +3314,10 @@
       "simpleId",
       "literalId"
     ],
+    [
+      "moduleName",
+      "varName"
+    ],
     [
       "simpleId",
       "moduleInstantiation"

diff --git a/src/node-types.json b/src/node-types.json
@@ -3296,7 +3296,18 @@
   {
     "type": "moduleInstantiation",
     "named": true,
-    "fields": {},
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "moduleName",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": true,