@willbooster/tree-sitter-java 3.0.3 → 3.1.0

package/grammar.js

@@ -102,8 +102,6 @@ module.exports = grammar({
       $.method_declaration,
     ),
 
-    // Literals
-
     _literal: $ => choice(
       $.decimal_integer_literal,
       $.hex_integer_literal,
@@ -227,8 +225,6 @@ module.exports = grammar({
 
     null_literal: _ => 'null',
 
-    // Expressions
-
     expression: $ => choice(
       $.assignment_expression,
       $.binary_expression,
@@ -540,8 +536,6 @@ module.exports = grammar({
 
     guard: $ => seq('when', $.expression),
 
-    // Statements
-
     statement: $ => choice(
       $.declaration,
       $.expression_statement,
@@ -709,8 +703,6 @@ module.exports = grammar({
       field('body', $.statement),
     ),
 
-    // Annotations
-
     _annotation: $ => choice(
       $.marker_annotation,
       $.annotation,
@@ -755,8 +747,6 @@ module.exports = grammar({
       '}',
     ),
 
-    // Declarations
-
     declaration: $ => prec(PREC.DECL, choice(
       $.module_declaration,
       $.package_declaration,
@@ -848,9 +838,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))),
+      ),
       ';',
     ),
 
@@ -986,8 +977,8 @@ module.exports = grammar({
 
     constructor_body: $ => seq(
       '{',
-      optional($.explicit_constructor_invocation),
       repeat($.statement),
+      optional(seq($.explicit_constructor_invocation, repeat($.statement))),
       '}',
     ),
 
@@ -1136,8 +1127,6 @@ module.exports = grammar({
       '}',
     ),
 
-    // Types
-
     _type: $ => choice(
       $._unannotated_type,
       $.annotated_type,
@@ -1238,12 +1227,12 @@ module.exports = grammar({
       $._variable_declarator_id,
     ),
 
-    receiver_parameter: $ => seq(
+    receiver_parameter: $ => prec.dynamic(1, seq(
       repeat($._annotation),
       $._unannotated_type,
       repeat(seq($.identifier, '.')),
       $.this,
-    ),
+    )),
 
     spread_parameter: $ => seq(
       optional($.modifiers),
@@ -1311,8 +1300,6 @@ module.exports = grammar({
 });
 
 /**
- * Creates a rule to match one or more of the rules separated by `separator`
- *
  * @param {RuleOrLiteral} rule
  *
  * @param {RuleOrLiteral} separator
@@ -1324,8 +1311,6 @@ function sep1(rule, separator) {
 }
 
 /**
- * Creates a rule to match one or more of the rules separated by a comma
- *
  * @param {RuleOrLiteral} rule
  *
  * @returns {SeqRule}
@@ -1335,8 +1320,6 @@ function commaSep1(rule) {
 }
 
 /**
- * Creates a rule to optionally match one or more of the rules separated by a comma
- *
  * @param {RuleOrLiteral} rule
  *
  * @returns {ChoiceRule}

package/package.json

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

package/tree-sitter.json

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