@willbooster/tree-sitter-kotlin 1.6.4 → 1.6.6

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/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.26.0-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.28.7-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-kotlin.svg)](https://crates.io/crates/willbooster-tree-sitter-kotlin)
 
 Kotlin grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -88,28 +88,35 @@ script/parse-examples
 cargo test
 ```
 
+Every `tree-sitter` command, from `generate` to the tests, runs the CLI of the WillBooster/tree-sitter runtime version
+locked in `Cargo.lock` (`script/tree-sitter`), whose generator and runtime have fixes that the upstream CLI lacks.
+`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 test` runs:
 
 - 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`): `tree-sitter fuzz` 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;
+- 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;
 - a check that real-world Kotlin files cloned into `examples/` fail to parse exactly as listed in
   `script/known-failures.txt`. The first run clones them. The example repositories are pinned to commits in
   `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples` rewrites
   it; review its diff before committing;
 - a performance check (`test/unit/performance.test.ts`) that recovering from an error on each line takes linear time
-  (ten times the lines take about ten times the CPU time, under a ceiling), since consumers parse files while they are being edited.
-  It loads the Wasm build through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after regenerating
-  the parser;
-- a check that comments containing NUL characters parse (`test/unit/nulCharacters.test.ts`);
+  (ten times the lines take about ten times the CPU time, under a ceiling), since consumers parse files while they are
+  being edited. It loads the Wasm build through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after
+  regenerating the parser;
+- a check that comments, strings, escapes, string templates, character literals, and shebang lines containing NUL
+  characters parse (`test/unit/nulCharacters.test.ts`);
 - a check that `package.json` and `Cargo.lock` test the same runtime version (`test/unit/runtimeVersion.test.ts`);
 - checks that the Wasm build parses Kotlin through @willbooster/web-tree-sitter in Chromium
   (`test/unit/browser.test.ts`) and in Cloudflare Workers with and without Node.js compatibility
   (`test/unit/workers.test.ts`).
 
 The tests and `script/parse-examples` compile the parser into `.tmp/tree-sitter-lib` rather than the CLI's cache shared
-by every checkout.
+by every checkout, and `mise.toml` sets `TREE_SITTER_LIBDIR` to it for any other command run in the checkout;
+`script/fuzz-corpus` builds a parser of its own in `.tmp/fuzz` for each run and deletes it afterwards.
 
 CI also runs these tests on Linux arm64 and macOS, where the Rust binding compiles the parser natively, and fuzzes the
 parser with libFuzzer and sanitizers (`.github/workflows/robustness.yml`).

package/grammar.js

@@ -121,6 +121,10 @@ module.exports = grammar({
     $._top_level_statement_end,
     // empty: it ends a context list of types among modifiers, except directly in a statement list (see `modifiers`)
     $._context_end,
+    // a hard keyword other than `this` right after the `$` of a string template (see `_template_name`)
+    $._keyword_reference,
+    // never scanned: see `_template_name`
+    $._keyword_reference_end,
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -861,7 +865,11 @@ module.exports = grammar({
     _template_name: ($) =>
       choice(
         alias(token.immediate(prec(2, /[\p{L}_][\p{L}_\p{Nd}]*/u)), $.identifier),
-        alias(token.immediate(prec(2, 'this')), $.this_expression)
+        alias(token.immediate(prec(2, 'this')), $.this_expression),
+        // As in Kotlin, another hard keyword after `$` is an error: the scanner lexes it, and the grammar then expects
+        // `_keyword_reference_end`, which is never scanned. The first alias keeps a name required in `interpolation`; the
+        // second makes the end visible when error recovery inserts it as missing, which a hidden token would not be.
+        seq(alias($._keyword_reference, $.identifier), alias($._keyword_reference_end, 'keyword_reference_end'))
       ),
 
     // In a string prefixed with n dollars (Kotlin 2.1), exactly n dollars start an interpolation; the scanner

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -21,8 +21,8 @@
     "*.wasm"
   ],
   "scripts": {
-    "build-wasm": "tree-sitter build --wasm",
-    "build/ci": "tree-sitter generate && script/generate-letter-ranges && tree-sitter build --wasm",
+    "build-wasm": "script/tree-sitter build --wasm",
+    "build/ci": "script/tree-sitter generate && script/generate-letter-ranges && script/tree-sitter build --wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
     "lint": "bun wb lint",
@@ -30,7 +30,7 @@
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
     "release": "wb release",
     "prestart": "bun run build-wasm",
-    "start": "tree-sitter playground",
+    "start": "script/tree-sitter playground",
     "test": "bun wb test",
     "test/ci": "bun wb test-on-ci",
     "test/ci-setup": "playwright install --with-deps chromium",
@@ -45,12 +45,12 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.13.1",
-    "@willbooster/web-tree-sitter": "1.0.8",
+    "@willbooster/web-tree-sitter": "1.0.16",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
     "oxlint": "1.85.0",
-    "oxlint-tsgolint": "7.0.2002",
+    "oxlint-tsgolint": "7.0.2003",
     "playwright": "1.63.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",

package/src/node-types.json

@@ -3129,6 +3129,10 @@
     "type": "is",
     "named": false
   },
+  {
+    "type": "keyword_reference_end",
+    "named": false
+  },
   {
     "type": "label",
     "named": true

package/tree-sitter.json

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