Exposes union_type directly instead of hiding it behind a type_list. …

…This also reduces the state count by breaking up large definitions
tree-sitter · Jan 31, 2022 · 0ce1342 · 0ce1342
1 parent 57f8554
commit 0ce1342
Show file tree

Hide file tree

Showing 8 changed files with 78,640 additions and 89,161 deletions.
diff --git a/grammar.js b/grammar.js
@@ -422,13 +422,17 @@ module.exports = grammar({
       optional($._return_type)
     ),
 
-    arrow_function: $ => seq(
+    _arrow_function_header: $ => seq(
       optional(field('attributes', $.attribute_list)),
       optional($.static_modifier),
       keyword('fn'),
       optional(field('reference_modifier', $.reference_modifier)),
       field('parameters', $.formal_parameters),
       optional($._return_type),
+    ),
+
+    arrow_function: $ => seq(
+      $._arrow_function_header,
       '=>',
       field('body', $._expression)
     ),
@@ -469,7 +473,7 @@ module.exports = grammar({
       field('name', $.variable_name)
     ),
 
-    _type: $ => alias($.union_type, $.type_list),
+    _type: $ => $.union_type,
 
     _types: $ => choice(
       $.optional_type,

diff --git a/src/grammar.json b/src/grammar.json
@@ -2069,7 +2069,7 @@
         }
       ]
     },
-    "arrow_function": {
+    "_arrow_function_header": {
       "type": "SEQ",
       "members": [
         {
@@ -2144,6 +2144,15 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "arrow_function": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_arrow_function_header"
         },
         {
           "type": "STRING",
@@ -2457,13 +2466,8 @@
       ]
     },
     "_type": {
-      "type": "ALIAS",
-      "content": {
-        "type": "SYMBOL",
-        "name": "union_type"
-      },
-      "named": true,
-      "value": "type_list"
+      "type": "SYMBOL",
+      "name": "union_type"
     },
     "_types": {
       "type": "CHOICE",

diff --git a/src/node-types.json b/src/node-types.json
@@ -328,7 +328,7 @@
     "named": true,
     "subtypes": [
       {
-        "type": "type_list",
+        "type": "union_type",
         "named": true
       }
     ]
@@ -4306,32 +4306,47 @@
         {
           "type": "named_type",
           "named": true
-        },
+        }
+      ]
+    }
+  },
+  {
+    "type": "unary_op_expression",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
         {
-          "type": "optional_type",
+          "type": "_expression",
           "named": true
         },
         {
-          "type": "primitive_type",
+          "type": "integer",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "unary_op_expression",
+    "type": "union_type",
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": true,
       "types": [
         {
-          "type": "_expression",
+          "type": "named_type",
           "named": true
         },
         {
-          "type": "integer",
+          "type": "optional_type",
+          "named": true
+        },
+        {
+          "type": "primitive_type",
           "named": true
         }
       ]
@@ -5035,11 +5050,11 @@
   },
   {
     "type": "float",
-    "named": true
+    "named": false
   },
   {
     "type": "float",
-    "named": false
+    "named": true
   },
   {
     "type": "fn",
@@ -5135,11 +5150,11 @@
   },
   {
     "type": "null",
-    "named": true
+    "named": false
   },
   {
     "type": "null",
-    "named": false
+    "named": true
   },
   {
     "type": "or",