Remove 'type' field from _type

fwcd · Nov 6, 2023 · d4ea76a · d4ea76a
1 parent d5e0cac
commit d4ea76a
Show file tree

Hide file tree

Showing 4 changed files with 1,746,833 additions and 1,748,776 deletions.
diff --git a/grammar.js b/grammar.js
@@ -462,13 +462,13 @@ module.exports = grammar({
 
     _type: $ => seq(
       optional($.type_modifiers),
-      field('type', choice(
+      choice(
         $.parenthesized_type,
         $.nullable_type,
         $._type_reference,
         $.function_type,
         $.not_nullable_type
-      ))
+      )
     ),
 
     _type_reference: $ => prec.left(1, choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -2452,33 +2452,29 @@
           ]
         },
         {
-          "type": "FIELD",
-          "name": "type",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "parenthesized_type"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "nullable_type"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_type_reference"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "function_type"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "not_nullable_type"
-              }
-            ]
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "parenthesized_type"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "nullable_type"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_type_reference"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "function_type"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "not_nullable_type"
+            }
+          ]
         }
       ]
     },