@willbooster/tree-sitter-java 3.0.0 → 3.0.2

package/grammar.js

@@ -9,9 +9,9 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
-const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional('_'), sep1(/[0-9]+/, /_+/))))));
-const DECIMAL_DIGITS = token(sep1(/[0-9]+/, '_'));
-const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, '_'));
+const DECIMAL_DIGITS = token(sep1(/[0-9]+/, /_+/));
+const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional(/_+/), DECIMAL_DIGITS)))));
+const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, /_+/));
 
 /* eslint-disable no-multi-spaces */
 
@@ -72,6 +72,9 @@ module.exports = grammar({
   ],
 
   conflicts: $ => [
+    [$.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],
@@ -126,22 +129,22 @@ module.exports = grammar({
     )),
 
     octal_integer_literal: _ => token(seq(
-      choice('0o', '0O', '0'),
-      sep1(/[0-7]+/, '_'),
+      choice('0o', '0O', seq('0', optional(/_+/))),
+      sep1(/[0-7]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     binary_integer_literal: _ => token(seq(
       choice('0b', '0B'),
-      sep1(/[01]+/, '_'),
+      sep1(/[01]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     decimal_floating_point_literal: _ => token(choice(
       seq(DECIMAL_DIGITS, '.', optional(DECIMAL_DIGITS), optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
       seq('.', DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
-      seq(DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
-      seq(DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
+      seq(DECIMAL_DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
+      seq(DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
     )),
 
     hex_floating_point_literal: _ => token(seq(
@@ -153,7 +156,7 @@ module.exports = grammar({
       optional(seq(
         /[pP]/,
         optional(choice('-', '+')),
-        DIGITS,
+        DECIMAL_DIGITS,
         optional(/[fFdD]/),
       )),
     )),
@@ -474,9 +477,9 @@ module.exports = grammar({
       seq($.super, $._type),
     ),
 
-    dimensions: $ => prec.right(repeat1(
+    dimensions: $ => repeat1(
       seq(repeat($._annotation), '[', ']'),
-    )),
+    ),
 
     switch_expression: $ => seq(
       'switch',
@@ -634,7 +637,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 +1181,7 @@ module.exports = grammar({
     )),
 
     array_type: $ => seq(
-      field('element', $._unannotated_type),
+      field('element', $._simple_type),
       field('dimensions', $.dimensions),
     ),
 
@@ -1240,8 +1246,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.0",
+  "version": "3.0.2",
   "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
         }
       ]

package/tree-sitter.json

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