@willbooster/tree-sitter-c-sharp 3.0.6 → 5.0.0

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-c-sharp/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-c-sharp/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-c-sharp/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-c-sharp/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.28.6-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-c-sharp.svg)](https://crates.io/crates/willbooster-tree-sitter-c-sharp)
 
 C# grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -33,8 +33,9 @@ Known gaps:
 
 The npm package ships `tree-sitter-c_sharp.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. Use runtime version 1.3.0 or later for the compact ABI 16 parser. Install the runtime alongside the grammar when using the Wasm parser; it
-remains an optional peer for consumers that only use the grammar source or queries.
+browsers, and Cloudflare Workers. The parser carries the ABI number of WillBooster/tree-sitter, so it loads only with
+that runtime, version 2.0.0 or later; upstream's runtime rejects it. Install the runtime alongside the grammar when using
+the Wasm parser; it remains an optional peer for consumers that only use the grammar source or queries.
 
 In Node.js and Bun, load it from the package:
 
@@ -76,15 +77,17 @@ parser.setLanguage(await Language.load(cSharp));
 ```
 
 The package also ships the queries in `queries/` and the node types in `src/node-types.json`.
+When extending the source grammar, use `grammar.js` and `src/scanner.c` from the same repository release tag.
+Their external directive tokens and serialized scanner state must match.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-c-sharp) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
-fuzzed with. The compact ABI 16 parser requires runtime 1.3.0 or later:
+fuzzed with. The parser requires runtime 2.0.0 or later:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "1.3.0" }
-tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "3" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
+tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "5" }
 ```
 
 ```rust
@@ -109,7 +112,7 @@ runtime this package ships. The first run downloads that CLI from its GitHub Rel
 `cargo` (with the `cmake` that `mise.toml` pins) when the download fails or the release has no binary that runs here. The `tree-sitter-cli` package provides
 only the types of the grammar DSL that `grammar.js` checks against; its `tree-sitter` binary is upstream's.
 
-`bun run generate` records a fresh ABI 16 generation profile from the applicable `test/corpus` cases and Git-tracked
+`bun run generate` records a fresh 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.

package/grammar.js

@@ -152,8 +152,18 @@ module.exports = grammar({
     // modifier) closed by ')=>'.
     $._lambda_paren_open,
     $._end_of_input,
-    $._directive_crlf,
+    $._directive_newline,
     $._file_directive_preproc_arg,
+    $._file_directive_sdk,
+    $._file_directive_package,
+    $._file_directive_property,
+    $._file_directive_project,
+    $._file_directive_ref,
+    $._file_directive_include,
+    $._file_directive_exclude,
+    $.file_directive_kind,
+    $._file_directive_literal_context,
+    $._file_directive_newline,
   ],
 
   extras: ($) => [
@@ -1524,7 +1534,7 @@ module.exports = grammar({
 
     interpolation_alignment_clause: ($) => seq(',', $.expression),
 
-    interpolation_format_clause: () => seq(':', /[^}"]+/),
+    interpolation_format_clause: ($) => seq(':', optional($._file_directive_literal_context), /[^}"]+/),
 
     member_access_expression: ($) =>
       prec(
@@ -1719,7 +1729,7 @@ module.exports = grammar({
     string_literal: ($) =>
       seq(
         '"',
-        repeat(choice($.string_literal_content, $.escape_sequence)),
+        repeat(choice($.string_literal_content, $.escape_sequence, $._file_directive_literal_context)),
         token.immediate('"'),
         optional($.string_literal_encoding)
       ),
@@ -1896,6 +1906,7 @@ module.exports = grammar({
         repeat(
           choice(
             $.string_literal_content,
+            $._file_directive_literal_context,
             alias(token.immediate(prec(-1, '\\')), $.string_literal_content),
             alias(
               token.immediate(
@@ -1959,25 +1970,17 @@ module.exports = grammar({
         choice(
           fileDirectiveArguments(
             $,
-            choice(
-              alias(token(prec(-2, /#:[sS][dD][kK]/)), '#:sdk'),
-              alias(token(prec(-2, /#:[pP][aA][cC][kK][aA][gG][eE]/)), '#:package')
-            ),
+            choice(alias($._file_directive_sdk, '#:sdk'), alias($._file_directive_package, '#:package')),
             '@',
             'metadata'
           ),
-          fileDirectiveArguments(
-            $,
-            alias(token(prec(-2, /#:[pP][rR][oO][pP][eE][rR][tT][yY]/)), '#:property'),
-            '=',
-            'value'
-          ),
+          fileDirectiveArguments($, alias($._file_directive_property, '#:property'), '=', 'value'),
           seq(
             choice(
-              alias(token(prec(-2, /#:[pP][rR][oO][jJ][eE][cC][tT]/)), '#:project'),
-              alias(token(prec(-2, /#:[rR][eE][fF]/)), '#:ref'),
-              alias(token(prec(-2, /#:[iI][nN][cC][lL][uU][dD][eE]/)), '#:include'),
-              alias(token(prec(-2, /#:[eE][xX][cC][lL][uU][dD][eE]/)), '#:exclude')
+              alias($._file_directive_project, '#:project'),
+              alias($._file_directive_ref, '#:ref'),
+              alias($._file_directive_include, '#:include'),
+              alias($._file_directive_exclude, '#:exclude')
             ),
             optional(seq($._file_directive_spacing, field('value', $.file_directive_value)))
           ),
@@ -1987,11 +1990,9 @@ module.exports = grammar({
           )
         ),
         optional($._file_directive_spacing),
-        choice(token.immediate(new RegExp(String.raw`\r\n|[${directiveLineBreak}]`)), $._end_of_input)
+        choice($._file_directive_newline, $._end_of_input)
       ),
 
-    file_directive_kind: () => token(prec(-2, new RegExp(`#:[^${directiveWhitespace}]*`))),
-
     _file_directive_spacing: () => token.immediate(prec(1, new RegExp(`[${directiveHorizontal}]+`))),
     file_directive_name: () =>
       token.immediate(
@@ -2068,7 +2069,7 @@ function directiveEnd($) {
 
 /** @param {GrammarSymbols<string>} $ */
 function directiveNewLine($) {
-  return choice($._directive_crlf, /[\r\n\u0085\u2028\u2029]/);
+  return $._directive_newline;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "3.0.6",
+  "version": "5.0.0",
   "description": "C# grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,8 +47,8 @@
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.23.1",
-    "@willbooster/web-tree-sitter": "1.4.8",
+    "@willbooster/wb": "22.24.0",
+    "@willbooster/web-tree-sitter": "2.0.1",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.16",
     "oxfmt": "0.71.0",
@@ -64,7 +64,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^1.3.0"
+    "@willbooster/web-tree-sitter": "^2.0.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/tree-sitter.json

@@ -19,7 +19,7 @@
     }
   ],
   "metadata": {
-    "version": "3.0.6",
+    "version": "5.0.0",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [