fix: import variable into array type

hhamud · Aug 5, 2023 · 6784b80 · 6784b80
1 parent 7a37221
commit 6784b80
Show file tree

Hide file tree

Showing 5 changed files with 13,063 additions and 13,070 deletions.
diff --git a/grammar.js b/grammar.js
@@ -245,7 +245,7 @@ module.exports = grammar({
         $.string_literal,
         $.identifier,
         $.as_identifier,
-        $.import_identifier
+        $.import_variable
       ),
 
     array: ($) =>
@@ -308,7 +308,7 @@ module.exports = grammar({
           $.array_type,
           $.generic_type,
           $.function_type,
-          $.import_identifier,
+          $.import_variable,
           field("type", $.identifier)
         )
       ),

diff --git a/noir-ts-mode.el b/noir-ts-mode.el
@@ -153,7 +153,8 @@
      (let_declaration (binary_expression left: (grouped_expression (identifier) @font-lock-variable-name-face)))
      (struct_definition var: (identifier) @font-lock-variable-name-face)
      (typed_identifier var: (identifier) @font-lock-variable-name-face)
-     (global (binary_expression left: (typed_identifier var: (identifier) @font-lock-variable-name-face))))
+     (global (binary_expression left: (typed_identifier var: (identifier) @font-lock-variable-name-face)))
+     )
 
    :feature 'string
    :language 'noir

diff --git a/src/grammar.json b/src/grammar.json
@@ -994,7 +994,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "import_identifier"
+          "name": "import_variable"
         }
       ]
     },
@@ -1282,7 +1282,7 @@
             },
             {
               "type": "SYMBOL",
-              "name": "import_identifier"
+              "name": "import_variable"
             },
             {
               "type": "FIELD",
@@ -2451,34 +2451,117 @@
     }
   ],
   "conflicts": [
-    ["function_call", "self_method"],
-    ["return_type", "generic_type"],
-    ["_array_parameter", "_type"],
-    ["_type", "generic_type"],
-    ["_type", "array"],
-    ["_type", "function_import"],
-    ["array_type", "array"],
-    ["generic_type", "typed_identifier"],
-    ["array_identifier", "_expression", "_type"],
-    ["array_identifier", "_expression"],
-    ["function_call", "struct_expression"],
-    ["_definition", "_expression"],
-    ["_statement", "_expression"],
-    ["struct_function", "struct_expression"],
-    ["struct_function", "_expression"],
-    ["struct_initialization", "single_type"],
-    ["generic_type", "_type", "_expression"],
-    ["function_call", "_type", "_expression"],
-    ["_type", "_expression"],
-    ["function_call", "_expression"],
-    ["_expression", "struct_initialization"],
-    ["_type", "_expression", "struct_initialization"],
-    ["module"],
-    ["_type"],
-    ["typed_identifier"],
-    ["self_method"],
-    ["function_import"],
-    ["let_declaration", "function_import"]
+    [
+      "function_call",
+      "self_method"
+    ],
+    [
+      "return_type",
+      "generic_type"
+    ],
+    [
+      "_array_parameter",
+      "_type"
+    ],
+    [
+      "_type",
+      "generic_type"
+    ],
+    [
+      "_type",
+      "array"
+    ],
+    [
+      "_type",
+      "function_import"
+    ],
+    [
+      "array_type",
+      "array"
+    ],
+    [
+      "generic_type",
+      "typed_identifier"
+    ],
+    [
+      "array_identifier",
+      "_expression",
+      "_type"
+    ],
+    [
+      "array_identifier",
+      "_expression"
+    ],
+    [
+      "function_call",
+      "struct_expression"
+    ],
+    [
+      "_definition",
+      "_expression"
+    ],
+    [
+      "_statement",
+      "_expression"
+    ],
+    [
+      "struct_function",
+      "struct_expression"
+    ],
+    [
+      "struct_function",
+      "_expression"
+    ],
+    [
+      "struct_initialization",
+      "single_type"
+    ],
+    [
+      "generic_type",
+      "_type",
+      "_expression"
+    ],
+    [
+      "function_call",
+      "_type",
+      "_expression"
+    ],
+    [
+      "_type",
+      "_expression"
+    ],
+    [
+      "function_call",
+      "_expression"
+    ],
+    [
+      "_expression",
+      "struct_initialization"
+    ],
+    [
+      "_type",
+      "_expression",
+      "struct_initialization"
+    ],
+    [
+      "module"
+    ],
+    [
+      "_type"
+    ],
+    [
+      "typed_identifier"
+    ],
+    [
+      "self_method"
+    ],
+    [
+      "function_import"
+    ],
+    [
+      "let_declaration",
+      "function_import"
+    ]
   ],
   "precedences": [],
   "externals": [
@@ -2490,3 +2573,4 @@
   "inline": [],
   "supertypes": []
 }
+
diff --git a/src/node-types.json b/src/node-types.json
@@ -16,7 +16,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -89,7 +89,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -147,7 +147,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -655,10 +655,6 @@
           "type": "import",
           "named": true
         },
-        {
-          "type": "import_identifier",
-          "named": true
-        },
         {
           "type": "import_variable",
           "named": true
@@ -1734,7 +1730,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -1895,10 +1891,6 @@
           "type": "import",
           "named": true
         },
-        {
-          "type": "import_identifier",
-          "named": true
-        },
         {
           "type": "import_variable",
           "named": true
@@ -2026,7 +2018,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -2136,7 +2128,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -2227,7 +2219,7 @@
           "named": true
         },
         {
-          "type": "import_identifier",
+          "type": "import_variable",
           "named": true
         },
         {
@@ -2660,4 +2652,4 @@
     "type": "}",
     "named": false
   }
-]
+]