@willbooster/tree-sitter-java 6.0.1 → 7.0.0

package/README.md

@@ -12,12 +12,15 @@ Java grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), fork
 [tree-sitter/tree-sitter-java](https://github.com/tree-sitter/tree-sitter-java). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork is based on tree-sitter-java 0.23.5 and accepts `final` modifiers on switch type patterns
-and typed record-pattern components, plus qualified names in record patterns. Unnamed variables in switch and
-`instanceof` type patterns, including typed record-pattern components, use `underscore_pattern` nodes. It ships the
-parser as the compact tables that the [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator
-emits under that fork's own ABI number (`0x57420007`), so the parser loads only with that runtime, version 9.0.0 or
-later within major version 9, and not with upstream's tree-sitter.
+This fork is based on tree-sitter-java 0.23.5 and accepts annotation and `final` modifiers on switch and
+`instanceof` type patterns and typed record-pattern components, plus qualified names in record patterns. Unnamed
+pattern variables use `underscore_pattern` nodes. Binding annotations are direct children of `type_pattern`,
+`instanceof_expression`, or `record_pattern_component`; an `instanceof` type test without a binding keeps its
+annotations inside the `right` field's `annotated_type` node.
+
+The parser ships as compact tables under the [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter)
+fork's ABI (`0x57420007`). This package is tested with runtime 9.0.0. Runtimes with a different ABI, including
+upstream's tree-sitter, reject the parser.
 
 ## Usage
 
@@ -81,7 +84,7 @@ fuzzed with:
 ```toml
 [dependencies]
 tree-sitter = { package = "willbooster-tree-sitter", version = "9.0.0" }
-tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "6" }
+tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "7" }
 ```
 
 ```rust

package/grammar.js

@@ -73,7 +73,7 @@ module.exports = grammar({
     [$.array_type, $._unannotated_type],
     [$.array_type, $.primary_expression],
     [$.modifiers, $.annotated_type, $.receiver_parameter],
-    [$.type_pattern, $.annotated_type],
+    [$.instanceof_expression, $.annotated_type],
     [$.modifiers, $.annotated_type, $.module_declaration, $.package_declaration],
     [$._unannotated_type, $.primary_expression, $.inferred_parameters],
     [$._unannotated_type, $.primary_expression],
@@ -384,12 +384,13 @@ module.exports = grammar({
     instanceof_expression: $ => prec(PREC.REL, seq(
       field('left', $.expression),
       'instanceof',
-      optional('final'),
       choice(
         seq(
-          field('right', $._type),
-          optional(field('name', choice($.identifier, $._reserved_identifier, $.underscore_pattern))),
+          repeat(choice($._annotation, 'final')),
+          field('right', $._unannotated_type),
+          field('name', choice($.identifier, $._reserved_identifier, $.underscore_pattern)),
         ),
+        field('right', $._type),
         field('pattern', $.record_pattern),
       ),
     )),
@@ -620,7 +621,7 @@ module.exports = grammar({
     record_pattern_component: $ => choice(
       $.underscore_pattern,
       seq(
-        optional('final'),
+        repeat(choice($._annotation, 'final')),
         $._unannotated_type,
         choice($.identifier, $._reserved_identifier, $.underscore_pattern),
       ),

package/package.json

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

package/src/node-types.json

@@ -2305,6 +2305,20 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "annotation",
+          "named": true
+        },
+        {
+          "type": "marker_annotation",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -3218,10 +3232,18 @@
           "type": "_unannotated_type",
           "named": true
         },
+        {
+          "type": "annotation",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "marker_annotation",
+          "named": true
+        },
         {
           "type": "underscore_pattern",
           "named": true

package/tree-sitter.json

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