fix: fix single types being incorrectly parsed as union_type

tree-sitter · Jan 24, 2024 · 5108ebe · 5108ebe
1 parent 0d931c1
commit 5108ebe
Show file tree

Hide file tree

Showing 11 changed files with 4,356 additions and 4,384 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -81,7 +81,7 @@ module.exports = function defineGrammar(dialect) {
       [$._array_destructing_element, $.array_element_initializer],
       [$._primary_expression, $._array_destructing_element],
 
-      [$.union_type, $.intersection_type, $.disjunctive_normal_form_type],
+      [$._type, $.union_type, $.intersection_type, $.disjunctive_normal_form_type],
       [$.union_type, $.disjunctive_normal_form_type],
       [$.intersection_type],
       [$.if_statement],
@@ -519,6 +519,7 @@ module.exports = function defineGrammar(dialect) {
       ),
 
       _type: $ => choice(
+        $._types,
         $.union_type,
         $.intersection_type,
         $.disjunctive_normal_form_type,
@@ -542,14 +543,14 @@ module.exports = function defineGrammar(dialect) {
 
       bottom_type: _ => 'never',
 
-      union_type: $ => prec.dynamic(1, pipeSep1($._types)),
+      union_type: $ => pipeSep1($._types),
 
       intersection_type: $ => ampSep1($._types),
 
-      disjunctive_normal_form_type: $ => pipeSep1(choice(
+      disjunctive_normal_form_type: $ => prec.dynamic(-1, pipeSep1(choice(
         seq('(', $.intersection_type, ')'),
         $._types,
-      )),
+      ))),
 
       primitive_type: _ => choice(
         'array',