@willbooster/tree-sitter-java 3.0.2 → 3.0.4

package/grammar.js

@@ -72,6 +72,7 @@ module.exports = grammar({
   ],
 
   conflicts: $ => [
+    [$._literal, $.switch_label],
     [$.dimensions],
     [$.array_type, $._unannotated_type],
     [$.array_type, $.primary_expression],
@@ -101,7 +102,6 @@ module.exports = grammar({
       $.method_declaration,
     ),
 
-    // Literals
 
     _literal: $ => choice(
       $.decimal_integer_literal,
@@ -226,7 +226,6 @@ module.exports = grammar({
 
     null_literal: _ => 'null',
 
-    // Expressions
 
     expression: $ => choice(
       $.assignment_expression,
@@ -508,6 +507,7 @@ module.exports = grammar({
     ),
 
     switch_label: $ => choice(
+      prec.dynamic(1, seq('case', $.null_literal, ',', 'default')),
       seq('case',
         choice(
           $.pattern,
@@ -538,7 +538,6 @@ module.exports = grammar({
 
     guard: $ => seq('when', $.expression),
 
-    // Statements
 
     statement: $ => choice(
       $.declaration,
@@ -707,7 +706,6 @@ module.exports = grammar({
       field('body', $.statement),
     ),
 
-    // Annotations
 
     _annotation: $ => choice(
       $.marker_annotation,
@@ -753,7 +751,6 @@ module.exports = grammar({
       '}',
     ),
 
-    // Declarations
 
     declaration: $ => prec(PREC.DECL, choice(
       $.module_declaration,
@@ -1134,7 +1131,6 @@ module.exports = grammar({
       '}',
     ),
 
-    // Types
 
     _type: $ => choice(
       $._unannotated_type,
@@ -1236,12 +1232,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),
@@ -1309,8 +1305,6 @@ module.exports = grammar({
 });
 
 /**
- * Creates a rule to match one or more of the rules separated by `separator`
- *
  * @param {RuleOrLiteral} rule
  *
  * @param {RuleOrLiteral} separator
@@ -1322,8 +1316,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}
@@ -1333,8 +1325,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.2",
+  "version": "3.0.4",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -3596,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.2",
+    "version": "3.0.4",
     "license": "MIT",
     "description": "Java grammar for tree-sitter",
     "authors": [