@willbooster/tree-sitter-kotlin 2.0.0 → 4.0.0

package/README.md

@@ -18,7 +18,7 @@ This fork fixes parsing bugs and raises conformance with the Kotlin grammar.
 
 The npm package ships `tree-sitter-kotlin.wasm` for
 [@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter), which runs in Node.js, Bun,
-browsers, and Cloudflare Workers.
+browsers, and Cloudflare Workers. The compact ABI 16 parser requires runtime 1.4.2 or later.
 
 In Node.js and Bun:
 
@@ -62,13 +62,12 @@ The package also ships the node types in `src/node-types.json`.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-kotlin) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
-fuzzed with (the grammar also loads in the upstream `tree-sitter` crate 0.27, whose error recovery never ends on some
-malformed input):
+fuzzed with. The compact ABI 16 parser requires runtime 1.4.2 or later:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "1" }
-tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "1.4.2" }
+tree-sitter-kotlin = { package = "willbooster-tree-sitter-kotlin", version = "4" }
 ```
 
 ```rust
@@ -93,6 +92,13 @@ locked in `Cargo.lock` (`script/tree-sitter`), whose generator and runtime have
 `script/fork-cli` downloads that CLI into `.tmp/` from its GitHub Release on first use, or builds it with `cargo` when
 the download fails or the release has no binary that runs here.
 
+`bun run generate` records a fresh ABI 16 generation profile from the applicable `test/corpus` cases and Git-tracked
+files in `examples/`, then generates compact parser tables. The parser also embeds metadata from `tree-sitter.json`. After changing a grammar,
+`tree-sitter.json`, a corpus case, or a tracked example,
+regenerate and commit `src/`. Stage added or removed examples with `git add -A examples` before generation so the profile uses the intended file list.
+Profiles in `.tmp/generation-profiles/` are temporary and must not be committed. `bun run build-wasm`, `bun run build/ci`,
+and the release build regenerate the parsers before compiling them.
+
 `bun run test` runs:
 
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);

package/grammar.js

@@ -137,6 +137,7 @@ module.exports = grammar({
     $._infix_position,
     $._companion_name_position,
     $._try_continuation_position,
+    $._infix_get_identifier,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -709,7 +710,15 @@ module.exports = grammar({
     range_expression: ($) => prec.left(PREC.RANGE, seq($.expression, choice('..', '..<'), $.expression)),
 
     infix_expression: ($) =>
-      prec.left(PREC.INFIX, seq($.expression, optional($._infix_position), $.identifier, $.expression)),
+      prec.left(
+        PREC.INFIX,
+        seq(
+          $.expression,
+          optional($._infix_position),
+          choice($.identifier, alias($._infix_get_identifier, $.identifier)),
+          $.expression
+        )
+      ),
 
     // Right-associative so that a trailing lambda after arguments belongs to the same call (`f(x) { … }`), as in
     // Kotlin, instead of calling the result of `f(x)`.
@@ -964,7 +973,7 @@ module.exports = grammar({
 
     label: () => token(/[a-zA-Z_][a-zA-Z_0-9]*@/),
 
-    _identifier: ($) => choice($.identifier, $._reserved_identifier),
+    _identifier: ($) => choice($.identifier, $._reserved_identifier, alias($._infix_get_identifier, $.identifier)),
 
     identifier: () => token(choice(/[\p{L}_][\p{L}_\p{Nd}]*/u, /`[^\r\n`]+`/)),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "2.0.0",
+  "version": "4.0.0",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -21,10 +21,11 @@
     "*.wasm"
   ],
   "scripts": {
-    "build-wasm": "script/tree-sitter build --wasm",
-    "build/ci": "script/tree-sitter generate && script/generate-letter-ranges && script/tree-sitter build --wasm",
+    "build-wasm": "script/generate --build-wasm",
+    "build/ci": "bun run build-wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
+    "generate": "script/generate",
     "lint": "bun wb lint",
     "lint-fix": "bun wb lint --fix",
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
@@ -45,7 +46,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.18.0",
-    "@willbooster/web-tree-sitter": "1.0.16",
+    "@willbooster/web-tree-sitter": "1.4.2",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
@@ -61,7 +62,7 @@
     "wrangler": "4.141.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^1.0.0"
+    "@willbooster/web-tree-sitter": "^1.4.2"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.0",
+    "version": "4.0.0",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [