@willbooster/tree-sitter-java 3.1.1 → 4.0.0

package/README.md

@@ -16,13 +16,13 @@ This fork is based on tree-sitter-java 0.23.5 and accepts `final` modifiers on s
 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 (`0x57420001`), so the parser loads only with that runtime, version 2.0.0 or
-later, and not with upstream's tree-sitter.
+emits under that fork's own ABI number (`0x57420006`), so the parser loads only with that runtime, version 7.0.5 or
+later within major version 7, and not with upstream's tree-sitter.
 
 ## Usage
 
 The npm package ships `tree-sitter-java.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 2.0.0 or later, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 7.0.5 or later within major version 7, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -68,8 +68,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2" }
-tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "4" }
 ```
 
 ```rust

package/grammar.js

@@ -225,15 +225,41 @@ module.exports = grammar({
 
     false: _ => 'false',
 
-    character_literal: _ => token(seq(
-      '\'',
-      repeat1(choice(
-        /[^\\'\n]/,
-        /\\./,
-        /\\\n/,
-      )),
-      '\'',
-    )),
+    character_literal: _ => {
+      const incompleteUnicode = /\\u+[0-9a-fA-F]{0,3}/;
+      const malformedUnicode = /\\u+([0-9a-fA-F]{1,3}[^0-9a-fA-F\\'\n]|[^0-9a-fA-Fu\\'\n])/;
+      const encodedBackslash = /\\u+005[cC]/;
+      const unicodeCharacter = /\\u+([1-9a-fA-F][0-9a-fA-F]{3}|0[1-9a-fA-F][0-9a-fA-F]{2}|00[0-46-9a-fA-F][0-9a-fA-F]|005[0-9abd-fABD-F])/;
+      const plainCharacter = /[^\\'\n]/;
+      const rawEscape = /\\[^u]/;
+      const boundedEscape = choice(
+        malformedUnicode,
+        rawEscape,
+        unicodeCharacter,
+        seq(encodedBackslash, choice(encodedBackslash, /[^'\n]/, /\n/)),
+      );
+      const boundedTail = seq(
+        repeat(choice(
+          plainCharacter,
+          seq(repeat(incompleteUnicode), boundedEscape),
+        )),
+        repeat(incompleteUnicode),
+        optional(encodedBackslash),
+      );
+      const character = choice(
+        plainCharacter,
+        rawEscape,
+        unicodeCharacter,
+        seq(encodedBackslash, choice(encodedBackslash, /./, /\n/)),
+      );
+      return token(seq('\'', choice(
+        repeat1(character),
+        seq(repeat(character), repeat1(incompleteUnicode)),
+        seq(repeat(character), malformedUnicode, boundedTail),
+        seq(repeat(character), repeat1(incompleteUnicode), boundedEscape, boundedTail),
+        seq(repeat(character), repeat1(incompleteUnicode), encodedBackslash),
+      ), '\''));
+    },
 
     string_literal: $ => choice($._string_literal, $._multiline_string_literal),
     _string_literal: $ => seq(
@@ -274,15 +300,23 @@ module.exports = grammar({
       prec(2, token.immediate(seq('\\', /[^bfnrts'\"\\]/))),
       prec(1, $.escape_sequence),
     ),
-    escape_sequence: _ => token.immediate(seq(
-      '\\',
-      choice(
-        /[^xu0-7]/,
-        /[0-7]{1,3}/,
-        /x[0-9a-fA-F]{2}/,
-        /u[0-9a-fA-F]{4}/,
-        /u\{[0-9a-fA-F]+\}/,
-      ))),
+    escape_sequence: _ => token.immediate(choice(
+      seq(/\\u+005[cC]/, choice(
+        /(?:[0-3]|\\u+003[0-3])(?:[0-7]|\\u+003[0-7]){0,2}/,
+        /(?:[4-7]|\\u+003[4-7])(?:[0-7]|\\u+003[0-7])?/,
+        /\\u+[0-9a-fA-F]{4}/,
+      )),
+      seq(
+        choice('\\', /\\u+005[cC]/),
+        choice(
+          /[^xu0-7]/,
+          /(?:[0-3][0-7]{0,2}|[4-7][0-7]?)/,
+          /x[0-9a-fA-F]{2}/,
+          /u+[0-9a-fA-F]{4}/,
+          /u\{[0-9a-fA-F]+\}/,
+        ),
+      ),
+    )),
 
     null_literal: _ => 'null',
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-java",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,7 +47,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "2.0.1",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -60,7 +60,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^2.0.0"
+    "@willbooster/web-tree-sitter": "^7.0.5"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/tree-sitter.json

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