@willbooster/tree-sitter-java 3.0.4 → 3.1.1

package/grammar.js

@@ -80,7 +80,6 @@ module.exports = grammar({
     [$.modifiers, $.annotated_type, $.module_declaration, $.package_declaration],
     [$._unannotated_type, $.primary_expression, $.inferred_parameters],
     [$._unannotated_type, $.primary_expression],
-    [$._unannotated_type, $.primary_expression, $.scoped_type_identifier],
     [$._unannotated_type, $.scoped_type_identifier],
     [$._unannotated_type, $.generic_type],
     [$.generic_type, $.primary_expression],
@@ -90,8 +89,70 @@ module.exports = grammar({
     [$.inferred_parameters, $.primary_expression],
     [$.argument_list, $.record_pattern_body],
     [$.yield_statement, $._reserved_identifier],
+    [$.scoped_identifier, $.scoped_type_identifier],
+    [$.primary_expression, $.method_reference, $.scoped_identifier],
+    [$.primary_expression, $.method_reference, $.scoped_identifier, $._unannotated_type, $.scoped_type_identifier],
   ],
 
+  reserved: {
+    global: $ => [
+      'abstract',
+      'assert',
+      'boolean',
+      'break',
+      'byte',
+      'case',
+      'catch',
+      'char',
+      'class',
+      $._const,
+      'continue',
+      'default',
+      'do',
+      'double',
+      'else',
+      'enum',
+      'extends',
+      'final',
+      'finally',
+      'float',
+      'for',
+      $._goto,
+      'if',
+      'implements',
+      'import',
+      'instanceof',
+      'int',
+      'interface',
+      'long',
+      'native',
+      'new',
+      'package',
+      'private',
+      'protected',
+      'public',
+      'return',
+      'short',
+      'static',
+      'strictfp',
+      $.super,
+      'switch',
+      'synchronized',
+      $.this,
+      'throw',
+      'throws',
+      'transient',
+      'try',
+      'void',
+      'volatile',
+      'while',
+      $.underscore_pattern,
+      $.true,
+      $.false,
+      $.null_literal,
+    ],
+  },
+
   word: $ => $.identifier,
 
   rules: {
@@ -102,7 +163,6 @@ module.exports = grammar({
       $.method_declaration,
     ),
 
-
     _literal: $ => choice(
       $.decimal_integer_literal,
       $.hex_integer_literal,
@@ -226,7 +286,6 @@ module.exports = grammar({
 
     null_literal: _ => 'null',
 
-
     expression: $ => choice(
       $.assignment_expression,
       $.binary_expression,
@@ -311,7 +370,7 @@ module.exports = grammar({
 
     lambda_expression: $ => seq(
       field('parameters', choice(
-        $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier,
+        $.identifier, $.formal_parameters, $.inferred_parameters, $._reserved_identifier, $.underscore_pattern,
       )),
       '->',
       field('body', choice($.expression, $.block)),
@@ -319,7 +378,7 @@ module.exports = grammar({
 
     inferred_parameters: $ => seq(
       '(',
-      commaSep1(choice($.identifier, $._reserved_identifier)),
+      commaSep1(choice($.identifier, $._reserved_identifier, $.underscore_pattern)),
       ')',
     ),
 
@@ -452,11 +511,19 @@ module.exports = grammar({
 
     argument_list: $ => seq('(', commaSep($.expression), ')'),
 
-    method_reference: $ => seq(
-      choice($._type, $.primary_expression, $.super),
-      '::',
-      optional($.type_arguments),
-      choice('new', $.identifier),
+    method_reference: $ => choice(
+      seq(
+        choice($._type, $.primary_expression, $.super),
+        '::',
+        optional($.type_arguments),
+        choice('new', $.identifier),
+      ),
+      seq(
+        $._name, '.', $.super,
+        '::',
+        optional($.type_arguments),
+        $.identifier,
+      ),
     ),
 
     type_arguments: $ => seq(
@@ -538,7 +605,6 @@ module.exports = grammar({
 
     guard: $ => seq('when', $.expression),
 
-
     statement: $ => choice(
       $.declaration,
       $.expression_statement,
@@ -706,7 +772,6 @@ module.exports = grammar({
       field('body', $.statement),
     ),
 
-
     _annotation: $ => choice(
       $.marker_annotation,
       $.annotation,
@@ -751,7 +816,6 @@ module.exports = grammar({
       '}',
     ),
 
-
     declaration: $ => prec(PREC.DECL, choice(
       $.module_declaration,
       $.package_declaration,
@@ -843,9 +907,10 @@ module.exports = grammar({
 
     import_declaration: $ => seq(
       'import',
-      optional('static'),
-      $._name,
-      optional(seq('.', $.asterisk)),
+      choice(
+        seq('module', $._name),
+        seq(optional('static'), $._name, optional(seq('.', $.asterisk))),
+      ),
       ';',
     ),
 
@@ -981,8 +1046,8 @@ module.exports = grammar({
 
     constructor_body: $ => seq(
       '{',
-      optional($.explicit_constructor_invocation),
       repeat($.statement),
+      optional(seq($.explicit_constructor_invocation, repeat($.statement))),
       '}',
     ),
 
@@ -1131,7 +1196,6 @@ module.exports = grammar({
       '}',
     ),
 
-
     _type: $ => choice(
       $._unannotated_type,
       $.annotated_type,
@@ -1284,6 +1348,9 @@ module.exports = grammar({
       alias('yield', $.identifier),
     ),
 
+    _const: _ => /const/,
+    _goto: _ => /goto/,
+
     this: _ => 'this',
 
     super: _ => 'super',

package/package.json

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

package/src/node-types.json

@@ -2249,6 +2249,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "underscore_pattern",
+          "named": true
         }
       ]
     }
@@ -2459,6 +2463,10 @@
           {
             "type": "inferred_parameters",
             "named": true
+          },
+          {
+            "type": "underscore_pattern",
+            "named": true
           }
         ]
       }
@@ -2684,6 +2692,10 @@
           "type": "primary_expression",
           "named": true
         },
+        {
+          "type": "scoped_identifier",
+          "named": true
+        },
         {
           "type": "super",
           "named": true

package/tree-sitter.json

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