@willbooster/tree-sitter-c-sharp 14.1.4 → 15.0.1

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.43.2-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.48.9-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
@@ -41,13 +41,14 @@ The contextual type names `nint` and `nuint` use `identifier` nodes.
 
 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. The parser uses WillBooster ABI 7 and loads only with that runtime. Use version 10.0.2 or later within major version 10; upstream's runtime rejects it. Install the runtime alongside the grammar when using
+browsers, and Cloudflare Workers. The parser uses WillBooster ABI 9 and loads only with that runtime. Use version 13.0.0 or later within major version 13; 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:
 
 ```js
 import { fileURLToPath } from 'node:url';
+
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 
 await Parser.init();
@@ -60,9 +61,9 @@ const tree = parser.parse('class Program {}\n');
 In browsers, serve both `.wasm` files and load them by URL. With Vite:
 
 ```js
+import cSharpUrl from '@willbooster/tree-sitter-c-sharp/tree-sitter-c_sharp.wasm?url';
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 import runtimeUrl from '@willbooster/web-tree-sitter/web-tree-sitter.wasm?url';
-import cSharpUrl from '@willbooster/tree-sitter-c-sharp/tree-sitter-c_sharp.wasm?url';
 
 await Parser.init({ locateFile: () => runtimeUrl });
 const parser = new Parser();
@@ -74,9 +75,9 @@ compiles them at build time) and pass them to `Parser.init` and `Language.load`.
 `nodejs_compat` flag:
 
 ```js
+import cSharp from '@willbooster/tree-sitter-c-sharp/tree-sitter-c_sharp.wasm';
 import { Language, Parser } from '@willbooster/web-tree-sitter';
 import runtime from '@willbooster/web-tree-sitter/web-tree-sitter.wasm';
-import cSharp from '@willbooster/tree-sitter-c-sharp/tree-sitter-c_sharp.wasm';
 
 await Parser.init({ wasmModule: runtime });
 const parser = new Parser();
@@ -89,12 +90,12 @@ Their external 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. Use runtime 10.0.2 or later within major version 10:
+fuzzed with. Use runtime 13.0.0 or later within major version 13:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "10.0.2" }
-tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "11" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "13.0.0" }
+tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "15" }
 ```
 
 ```rust

package/grammar.js

@@ -1412,17 +1412,19 @@ module.exports = grammar({
         field('body', $.switch_body)
       ),
 
-    switch_body: ($) => seq('{', repeat($.switch_section), blockEnd()),
+    switch_body: ($) => seq('{', optional(conditionalSectionRun($)), repeat($.switch_section), blockEnd()),
 
     switch_section: ($) =>
       prec.left(
         seq(
           choice(seq('case', choice($.expression, seq($.pattern, optional($.when_clause)))), 'default'),
           alias(sym('_case_label_colon'), ':'),
-          repeat($.statement)
+          repeat(choice($.statement, $._preproc_if_in_switch_body))
         )
       ),
 
+    _preproc_if_in_switch_body: () => alias(sym('preproc_if_in_switch_body'), sym('preproc_if')),
+
     throw_statement: ($) => seq('throw', optional($.expression), statementEnd()),
 
     try_statement: ($) => seq('try', field('body', $.block), repeat($.catch_clause), optional($.finally_clause)),
@@ -2723,6 +2725,32 @@ module.exports = grammar({
     ...preprocIf('_in_top_level', ($) => conditionalStatements($), 0, false, true),
     ...preprocIf('_in_if_alternative', ($) => seq(optional('else'), conditionalStatements($)), 0, false),
 
+    // Alternatives start with any statements that continue the enclosing section. Nested directives precede the
+    // sections because a directive after a section belongs to that section's statements.
+    preproc_if_in_switch_body: ($) =>
+      conditionalDirective(
+        'if',
+        $,
+        choice(seq(conditionalSectionRun($), repeat($.switch_section)), repeat1($.switch_section)),
+        field('alternative', optional($._preproc_switch_body_alternative)),
+        preprocessor('endif')
+      ),
+    preproc_elif_in_switch_body: ($) =>
+      conditionalDirective(
+        'elif',
+        $,
+        repeat($.statement),
+        optional(conditionalSectionRun($)),
+        repeat($.switch_section),
+        field('alternative', optional($._preproc_switch_body_alternative))
+      ),
+    preproc_else_in_switch_body: ($) =>
+      seq(preprocessor('else'), repeat($.statement), optional(conditionalSectionRun($)), repeat($.switch_section)),
+    _preproc_switch_body_alternative: () =>
+      choice(
+        alias(sym('preproc_else_in_switch_body'), sym('preproc_else')),
+        alias(sym('preproc_elif_in_switch_body'), sym('preproc_elif'))
+      ),
     ...preprocIf('_in_expression', ($) => $.expression, -2, false),
     ...conditionalListDirective('_in_initializer', ($) => $.expression),
     ...conditionalListDirective(
@@ -3161,6 +3189,15 @@ function argumentValue($) {
   return choice(seq(optional(choice('ref', 'out', 'in')), $.expression), seq('out', $.declaration_expression));
 }
 
+/**
+ * Conditional switch sections followed by more of them or by the statements their conditional labels share.
+ *
+ * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'_preproc_if_in_switch_body' | 'statement'>} $
+ */
+function conditionalSectionRun($) {
+  return seq($._preproc_if_in_switch_body, repeat(choice($._preproc_if_in_switch_body, $.statement)));
+}
+
 /**
  * Statements of a conditional branch, where the last may be an if statement whose `else` body follows the directive.
  *

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "14.1.4",
+  "version": "15.0.1",
   "description": "C# grammar for tree-sitter",
   "keywords": [
+    "c-sharp",
     "incremental",
     "parsing",
-    "tree-sitter",
-    "c-sharp"
+    "tree-sitter"
   ],
+  "license": "MIT",
+  "author": "WillBooster Inc.",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WillBooster/tree-sitter-c-sharp.git"
   },
-  "license": "MIT",
-  "author": "WillBooster Inc.",
   "files": [
     "grammar.js",
     "queries/*.scm",
@@ -21,6 +21,10 @@
     "src/node-types.json",
     "*.wasm"
   ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "scripts": {
     "build-wasm": "script/generate --build-wasm",
     "build/ci": "bun run build-wasm",
@@ -44,33 +48,26 @@
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
     "@types/bun": "1.4.3",
-    "@vitest/browser-playwright": "5.0.3",
-    "@willbooster/oxfmt-config": "1.2.2",
-    "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.26.2",
-    "@willbooster/web-tree-sitter": "10.0.2",
+    "@vitest/browser-playwright": "5.0.5",
+    "@willbooster/oxlint-config": "1.4.9",
+    "@willbooster/wb": "22.29.3",
+    "@willbooster/web-tree-sitter": "13.0.0",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.2",
-    "oxfmt": "0.73.0",
     "oxlint": "1.88.0",
     "oxlint-tsgolint": "7.0.2004",
-    "playwright": "1.64.0",
+    "playwright": "1.64.1",
     "semantic-release": "25.0.9",
-    "sort-package-json": "4.0.0",
     "vite": "8.3.4",
-    "vitest": "5.0.3",
-    "wrangler": "4.149.0"
+    "vitest": "5.0.5",
+    "wrangler": "4.151.1"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^10.0.2"
+    "@willbooster/web-tree-sitter": "^13.0.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {
       "optional": true
     }
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
   }
 }

package/src/node-types.json

@@ -6368,6 +6368,10 @@
           "type": "switch_expression_arm",
           "named": true
         },
+        {
+          "type": "switch_section",
+          "named": true
+        },
         {
           "type": "type_declaration",
           "named": true
@@ -6460,6 +6464,10 @@
           "type": "switch_expression_arm",
           "named": true
         },
+        {
+          "type": "switch_section",
+          "named": true
+        },
         {
           "type": "type_declaration",
           "named": true
@@ -6629,6 +6637,10 @@
           "type": "switch_expression_arm",
           "named": true
         },
+        {
+          "type": "switch_section",
+          "named": true
+        },
         {
           "type": "type_declaration",
           "named": true
@@ -7572,6 +7584,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "statement",
+          "named": true
+        },
         {
           "type": "switch_section",
           "named": true

package/tree-sitter.json

@@ -31,7 +31,7 @@
     }
   ],
   "metadata": {
-    "version": "14.1.4",
+    "version": "15.0.1",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [