@willbooster/tree-sitter-java 3.0.1 → 3.0.3

package/grammar.js

@@ -72,6 +72,10 @@ module.exports = grammar({
   ],
 
   conflicts: $ => [
+    [$._literal, $.switch_label],
+    [$.dimensions],
+    [$.array_type, $._unannotated_type],
+    [$.array_type, $.primary_expression],
     [$.modifiers, $.annotated_type, $.receiver_parameter],
     [$.modifiers, $.annotated_type, $.module_declaration, $.package_declaration],
     [$._unannotated_type, $.primary_expression, $.inferred_parameters],
@@ -474,9 +478,9 @@ module.exports = grammar({
       seq($.super, $._type),
     ),
 
-    dimensions: $ => prec.right(repeat1(
+    dimensions: $ => repeat1(
       seq(repeat($._annotation), '[', ']'),
-    )),
+    ),
 
     switch_expression: $ => seq(
       'switch',
@@ -505,6 +509,7 @@ module.exports = grammar({
     ),
 
     switch_label: $ => choice(
+      prec.dynamic(1, seq('case', $.null_literal, ',', 'default')),
       seq('case',
         choice(
           $.pattern,
@@ -634,7 +639,10 @@ module.exports = grammar({
       $._variable_declarator_id,
     ),
 
-    catch_type: $ => sep1($._unannotated_type, '|'),
+    catch_type: $ => seq(
+      $._unannotated_type,
+      repeat(seq('|', $._type)),
+    ),
 
     finally_clause: $ => seq('finally', $.block),
 
@@ -1175,7 +1183,7 @@ module.exports = grammar({
     )),
 
     array_type: $ => seq(
-      field('element', $._unannotated_type),
+      field('element', $._simple_type),
       field('dimensions', $.dimensions),
     ),
 
@@ -1240,8 +1248,8 @@ module.exports = grammar({
     spread_parameter: $ => seq(
       optional($.modifiers),
       $._unannotated_type,
-      '...',
       repeat($._annotation),
+      '...',
       $.variable_declarator,
     ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-java",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -735,7 +735,31 @@
         "required": true,
         "types": [
           {
-            "type": "_unannotated_type",
+            "type": "boolean_type",
+            "named": true
+          },
+          {
+            "type": "floating_point_type",
+            "named": true
+          },
+          {
+            "type": "generic_type",
+            "named": true
+          },
+          {
+            "type": "integral_type",
+            "named": true
+          },
+          {
+            "type": "scoped_type_identifier",
+            "named": true
+          },
+          {
+            "type": "type_identifier",
+            "named": true
+          },
+          {
+            "type": "void_type",
             "named": true
           }
         ]
@@ -1093,7 +1117,7 @@
       "required": true,
       "types": [
         {
-          "type": "_unannotated_type",
+          "type": "_type",
           "named": true
         }
       ]
@@ -3572,6 +3596,10 @@
           "type": "guard",
           "named": true
         },
+        {
+          "type": "null_literal",
+          "named": true
+        },
         {
           "type": "pattern",
           "named": true

package/tree-sitter.json

@@ -14,7 +14,7 @@
     }
   ],
   "metadata": {
-    "version": "3.0.1",
+    "version": "3.0.3",
     "license": "MIT",
     "description": "Java grammar for tree-sitter",
     "authors": [