Adds support for intersection types

tree-sitter · Jul 16, 2022 · 49a69af · 49a69af
1 parent ece74b2
commit 49a69af
Show file tree

Hide file tree

Showing 5 changed files with 60,312 additions and 59,843 deletions.
diff --git a/grammar.js b/grammar.js
@@ -65,6 +65,8 @@ module.exports = grammar({
     [$._primary_expression, $._array_destructing_element],
 
     [$.union_type, $._return_type],
+    [$.union_type, $.intersection_type],
+    [$.intersection_type],
     [$.if_statement],
 
     [$.namespace_name],
@@ -149,7 +151,7 @@ module.exports = grammar({
 
     empty_statement: $ => prec(-1, ';'),
 
-    reference_modifier: $ => '&',
+    reference_modifier: $ => token('&'),
 
     function_static_declaration: $ => seq(
       keyword('static'),
@@ -481,7 +483,7 @@ module.exports = grammar({
       field('name', $.variable_name)
     ),
 
-    _type: $ => $.union_type,
+    _type: $ => choice($.union_type, $.intersection_type),
 
     _types: $ => choice(
       $.optional_type,
@@ -503,6 +505,8 @@ module.exports = grammar({
 
     union_type: $ => prec.right(pipeSep1($._types)),
 
+    intersection_type: $ => ampSep1($._types),
+
     primitive_type: $ => choice(
       'array',
       keyword('callable'), // not legal in property types
@@ -1498,8 +1502,8 @@ function pipeSep1(rule) {
   return seq(rule, repeat(seq('|', rule)));
 }
 
-function pipeSep(rule) {
-  return optional(commaSep1(rule));
+function ampSep1(rule) {
+  return seq(rule, repeat(seq(token('&'), rule)));
 }
 
 function backtick_chars() {

diff --git a/src/grammar.json b/src/grammar.json
@@ -230,8 +230,11 @@
       }
     },
     "reference_modifier": {
-      "type": "STRING",
-      "value": "&"
+      "type": "TOKEN",
+      "content": {
+        "type": "STRING",
+        "value": "&"
+      }
     },
     "function_static_declaration": {
       "type": "SEQ",
@@ -2495,8 +2498,17 @@
       ]
     },
     "_type": {
-      "type": "SYMBOL",
-      "name": "union_type"
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "union_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "intersection_type"
+        }
+      ]
     },
     "_types": {
       "type": "CHOICE",
@@ -2583,6 +2595,34 @@
         ]
       }
     },
+    "intersection_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_types"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "TOKEN",
+                "content": {
+                  "type": "STRING",
+                  "value": "&"
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_types"
+              }
+            ]
+          }
+        }
+      ]
+    },
     "primitive_type": {
       "type": "CHOICE",
       "members": [
@@ -8807,6 +8847,13 @@
       "union_type",
       "_return_type"
     ],
+    [
+      "union_type",
+      "intersection_type"
+    ],
+    [
+      "intersection_type"
+    ],
     [
       "if_statement"
     ],

diff --git a/src/node-types.json b/src/node-types.json
@@ -331,6 +331,10 @@
     "type": "_type",
     "named": true,
     "subtypes": [
+      {
+        "type": "intersection_type",
+        "named": true
+      },
       {
         "type": "union_type",
         "named": true
@@ -2486,6 +2490,29 @@
       ]
     }
   },
+  {
+    "type": "intersection_type",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "named_type",
+          "named": true
+        },
+        {
+          "type": "optional_type",
+          "named": true
+        },
+        {
+          "type": "primitive_type",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "list_literal",
     "named": true,
@@ -5407,11 +5434,11 @@
   },
   {
     "type": "null",
-    "named": true
+    "named": false
   },
   {
     "type": "null",
-    "named": false
+    "named": true
   },
   {
     "type": "or",