@willbooster/tree-sitter-java 2.0.3 → 3.0.1

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-java/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-java/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-java/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-java/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.41.8-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-java.svg)](https://crates.io/crates/willbooster-tree-sitter-java)
 
 Java grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -13,10 +13,11 @@ Java grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), fork
 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. These extensions preserve the existing
-node types. 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.
+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.
 
 ## Usage
 
@@ -110,8 +111,7 @@ and the release build regenerate the parsers before compiling them.
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
   edits each corpus case at random, reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`,
-  `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits. It skips the one case that upstream's own
-  parser also reparses differently from a fresh parse (see `script/fuzz-corpus`);
+  `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits;
 - a check that the real-world Java files of the repositories cloned into `examples/` fail to parse exactly as listed in
   `script/known-failures.txt`. The first run clones the repositories. The example
   repositories are pinned to commits in `script/parse-examples`. After a grammar change or a moved pin alters that

package/grammar.js

@@ -9,9 +9,9 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
-const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional('_'), sep1(/[0-9]+/, /_+/))))));
-const DECIMAL_DIGITS = token(sep1(/[0-9]+/, '_'));
-const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, '_'));
+const DECIMAL_DIGITS = token(sep1(/[0-9]+/, /_+/));
+const DIGITS = token(choice('0', seq(/[1-9]/, optional(seq(optional(/_+/), DECIMAL_DIGITS)))));
+const HEX_DIGITS = token(sep1(/[A-Fa-f0-9]+/, /_+/));
 
 /* eslint-disable no-multi-spaces */
 
@@ -126,22 +126,22 @@ module.exports = grammar({
     )),
 
     octal_integer_literal: _ => token(seq(
-      choice('0o', '0O', '0'),
-      sep1(/[0-7]+/, '_'),
+      choice('0o', '0O', seq('0', optional(/_+/))),
+      sep1(/[0-7]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     binary_integer_literal: _ => token(seq(
       choice('0b', '0B'),
-      sep1(/[01]+/, '_'),
+      sep1(/[01]+/, /_+/),
       optional(choice('l', 'L')),
     )),
 
     decimal_floating_point_literal: _ => token(choice(
       seq(DECIMAL_DIGITS, '.', optional(DECIMAL_DIGITS), optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
       seq('.', DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), optional(/[fFdD]/)),
-      seq(DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
-      seq(DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
+      seq(DECIMAL_DIGITS, /[eE]/, optional(choice('-', '+')), DECIMAL_DIGITS, optional(/[fFdD]/)),
+      seq(DECIMAL_DIGITS, optional(seq((/[eE]/), optional(choice('-', '+')), DECIMAL_DIGITS)), (/[fFdD]/)),
     )),
 
     hex_floating_point_literal: _ => token(seq(
@@ -153,7 +153,7 @@ module.exports = grammar({
       optional(seq(
         /[pP]/,
         optional(choice('-', '+')),
-        DIGITS,
+        DECIMAL_DIGITS,
         optional(/[fFdD]/),
       )),
     )),
@@ -301,7 +301,7 @@ module.exports = grammar({
       choice(
         seq(
           field('right', $._type),
-          optional(field('name', choice($.identifier, $._reserved_identifier))),
+          optional(field('name', choice($.identifier, $._reserved_identifier, $.underscore_pattern))),
         ),
         field('pattern', $.record_pattern),
       ),
@@ -519,7 +519,7 @@ module.exports = grammar({
       $.type_pattern,
       $.record_pattern,
     ),
-    type_pattern: $ => seq(optional('final'), $._unannotated_type, choice($.identifier, $._reserved_identifier)),
+    type_pattern: $ => seq(optional('final'), $._unannotated_type, choice($.identifier, $._reserved_identifier, $.underscore_pattern)),
     record_pattern: $ => seq(choice($.identifier, $._reserved_identifier, $.generic_type, $.scoped_type_identifier), $.record_pattern_body),
     record_pattern_body: $ => seq('(', commaSep(choice($.record_pattern_component, $.record_pattern)), ')'),
     record_pattern_component: $ => choice(
@@ -527,7 +527,7 @@ module.exports = grammar({
       seq(
         optional('final'),
         $._unannotated_type,
-        choice($.identifier, $._reserved_identifier),
+        choice($.identifier, $._reserved_identifier, $.underscore_pattern),
       ),
     ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-java",
-  "version": "2.0.3",
+  "version": "3.0.1",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -46,17 +46,16 @@
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.24.0",
+    "@willbooster/wb": "22.26.1",
     "@willbooster/web-tree-sitter": "2.0.1",
     "conventional-changelog-conventionalcommits": "10.4.0",
-    "lefthook": "2.1.16",
-    "oxfmt": "0.71.0",
-    "oxlint": "1.86.0",
-    "oxlint-tsgolint": "7.0.2003",
+    "lefthook": "2.2.1",
+    "oxfmt": "0.72.0",
+    "oxlint": "1.87.0",
+    "oxlint-tsgolint": "7.0.2004",
     "playwright": "1.63.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "typescript": "7.0.2",
     "vitest": "5.0.3",
     "wrangler": "4.147.0"
   },

package/queries/highlights.scm

@@ -1,8 +1,4 @@
-; Variables
-
-(identifier) @variable
-
-; Methods
+[(identifier) (underscore_pattern)] @variable
 
 (method_declaration
   name: (identifier) @function.method)
@@ -10,8 +6,6 @@
   name: (identifier) @function.method)
 (super) @function.builtin
 
-; Annotations
-
 (annotation
   name: (identifier) @attribute)
 (marker_annotation
@@ -19,8 +13,6 @@
 
 "@" @operator
 
-; Types
-
 (type_identifier) @type
 
 (interface_declaration
@@ -54,17 +46,11 @@
   (void_type)
 ] @type.builtin
 
-; Constants
-
 ((identifier) @constant
  (#match? @constant "^_*[A-Z][A-Z\\d_]+$"))
 
-; Builtins
-
 (this) @variable.builtin
 
-; Literals
-
 [
   (hex_integer_literal)
   (decimal_integer_literal)
@@ -90,8 +76,6 @@
   (block_comment)
 ] @comment
 
-; Keywords
-
 [
   "abstract"
   "assert"

package/src/node-types.json

@@ -2250,6 +2250,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "underscore_pattern",
+            "named": true
           }
         ]
       },
@@ -3896,6 +3900,10 @@
         {
           "type": "identifier",
           "named": true
+        },
+        {
+          "type": "underscore_pattern",
+          "named": true
         }
       ]
     }

package/tree-sitter.json

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