@willbooster/tree-sitter-java 7.0.3 → 8.0.0

package/README.md

@@ -18,6 +18,8 @@ pattern variables use `underscore_pattern` nodes. Binding annotations are direct
 `instanceof_expression`, or `record_pattern_component`; an `instanceof` type test without a binding keeps its
 annotations inside the `right` field's `annotated_type` node.
 
+Annotation interface declarations expose separate `@` and `interface` tokens.
+
 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.
@@ -84,7 +86,7 @@ fuzzed with:
 ```toml
 [dependencies]
 tree-sitter = { package = "willbooster-tree-sitter", version = "9.0.0" }
-tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "7" }
+tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "8" }
 ```
 
 ```rust

package/grammar.js

@@ -68,6 +68,7 @@ module.exports = grammar({
   ],
 
   conflicts: $ => [
+    [$.modifiers],
     [$._literal, $.switch_label],
     [$.dimensions],
     [$.array_type, $._unannotated_type],
@@ -1129,7 +1130,8 @@ module.exports = grammar({
 
     annotation_type_declaration: $ => seq(
       optional($.modifiers),
-      '@interface',
+      '@',
+      'interface',
       field('name', $.identifier),
       field('body', $.annotation_type_body),
     ),
@@ -1385,8 +1387,8 @@ module.exports = grammar({
 
     super: _ => 'super',
 
-    // https://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-IdentifierChars
-    identifier: _ => /[\p{XID_Start}_$][\p{XID_Continue}\u00A2_$]*/,
+    // Unicode 17 additions supplement the generator's Unicode 16 category tables.
+    identifier: _ => /[\p{L}\p{Nl}\p{Sc}\p{Pc}\u{88F}\u{C5C}\u{CDC}\u{20C1}\u{A7CE}-\u{A7CF}\u{A7D2}\u{A7D4}\u{A7F1}\u{10940}-\u{10959}\u{10EC5}-\u{10EC7}\u{11DB0}-\u{11DDB}\u{16EA0}-\u{16EB8}\u{16EBB}-\u{16ED3}\u{16FF2}-\u{16FF6}\u{187F8}-\u{187FF}\u{18D09}-\u{18D1E}\u{18D80}-\u{18DF2}\u{1E6C0}-\u{1E6DE}\u{1E6E0}-\u{1E6E2}\u{1E6E4}-\u{1E6E5}\u{1E6E7}-\u{1E6ED}\u{1E6F0}-\u{1E6F4}\u{1E6FE}-\u{1E6FF}\u{2B73A}-\u{2B73F}\u{2CEA2}-\u{2CEAD}\u{323B0}-\u{33479}][\p{L}\p{Nl}\p{Sc}\p{Pc}\p{Nd}\p{Mc}\p{Mn}\p{Cf}\u0000-\u0008\u000E-\u001B\u007F-\u009F\u{88F}\u{C5C}\u{CDC}\u{1ACF}-\u{1ADD}\u{1AE0}-\u{1AEB}\u{20C1}\u{A7CE}-\u{A7CF}\u{A7D2}\u{A7D4}\u{A7F1}\u{10940}-\u{10959}\u{10EC5}-\u{10EC7}\u{10EFA}-\u{10EFB}\u{11B60}-\u{11B67}\u{11DB0}-\u{11DDB}\u{11DE0}-\u{11DE9}\u{16EA0}-\u{16EB8}\u{16EBB}-\u{16ED3}\u{16FF2}-\u{16FF6}\u{187F8}-\u{187FF}\u{18D09}-\u{18D1E}\u{18D80}-\u{18DF2}\u{1E6C0}-\u{1E6DE}\u{1E6E0}-\u{1E6F5}\u{1E6FE}-\u{1E6FF}\u{2B73A}-\u{2B73F}\u{2CEA2}-\u{2CEAD}\u{323B0}-\u{33479}]*/u,
 
     line_comment: _ => token(prec(PREC.COMMENT, seq('//', /[^\n]*/))),
 

package/package.json

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

package/src/node-types.json

@@ -4349,10 +4349,6 @@
     "type": "@",
     "named": false
   },
-  {
-    "type": "@interface",
-    "named": false
-  },
   {
     "type": "[",
     "named": false

package/tree-sitter.json

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