@willbooster/tree-sitter-c-sharp 15.0.0 → 15.0.2

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
@@ -48,6 +48,7 @@ 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();

package/grammar.js

@@ -53,6 +53,9 @@ module.exports = grammar({
   name: 'c_sharp',
 
   conflicts: ($) => [
+    [$._stackalloc_array_type, $.array_type],
+    [$._stackalloc_array_type, $._array_base_type],
+    [$._stackalloc_nullable_type, $.nullable_type],
     [$._simple_name, $._expression_simple_name, $._pattern_simple_identifier_name, $._ambiguous_cast_qualified_name],
     [$._expression_simple_name, $._ambiguous_cast_qualified_name],
     [$._simple_name, $._expression_simple_name, $._ambiguous_cast_qualified_name],
@@ -185,6 +188,13 @@ module.exports = grammar({
     [$._pattern_identifier, $.from_clause, $._reserved_identifier],
     [$.scoped_type, $._pattern_identifier, $._reserved_identifier],
     [$._pattern_identifier, $._lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
+    [
+      $._pattern_identifier,
+      $._lambda_expression_init,
+      $._typed_lambda_expression_init,
+      $.anonymous_method_expression,
+      $._reserved_identifier,
+    ],
     [$._pattern_identifier, $.identifier],
     [$.implicit_type, $._pattern_identifier, $._reserved_identifier],
     [$._pattern_primary_expression, $._conditional_access_receiver],
@@ -251,11 +261,23 @@ module.exports = grammar({
     [$._reserved_identifier, $.modifier],
     [$._reserved_identifier],
     [$._lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
+    [$._lambda_expression_init, $._typed_lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
     [$._lambda_expression_init, $._reserved_identifier],
+    [$._lambda_expression_init, $._typed_lambda_expression_init, $._reserved_identifier],
     [$.modifier, $._lambda_expression_init, $.anonymous_method_expression],
+    [$.modifier, $._lambda_expression_init, $._typed_lambda_expression_init, $.anonymous_method_expression],
     [$.modifier, $._lambda_expression_init],
+    [$.modifier, $._lambda_expression_init, $._typed_lambda_expression_init],
     [$.modifier, $._lambda_expression_init, $._reserved_identifier],
+    [$.modifier, $._lambda_expression_init, $._typed_lambda_expression_init, $._reserved_identifier],
     [$.modifier, $._lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
+    [
+      $.modifier,
+      $._lambda_expression_init,
+      $._typed_lambda_expression_init,
+      $.anonymous_method_expression,
+      $._reserved_identifier,
+    ],
     [$._reserved_identifier, $.scoped_type],
     [$._reserved_identifier, $.implicit_type],
     [$._reserved_identifier, $.from_clause],
@@ -359,6 +381,9 @@ module.exports = grammar({
     sym('_expression_generic_end'),
     sym('_definite_expression_generic_end'),
     sym('_if_alternative_directive'),
+    sym('_conditional_consequence_start'),
+    sym('_expression_generic_start'),
+    sym('_stackalloc_context'),
   ],
 
   extras: ($) => [
@@ -632,7 +657,7 @@ module.exports = grammar({
 
     type_parameter_list: ($) =>
       seq(
-        '<',
+        genericStart(),
         commaSep1($.type_parameter),
         choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
       ),
@@ -1055,7 +1080,7 @@ module.exports = grammar({
 
     type_argument_list: ($) =>
       seq(
-        '<',
+        genericStart(),
         choice(repeat(','), commaSep1($.type)),
         choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
       ),
@@ -1067,7 +1092,7 @@ module.exports = grammar({
 
     _expression_type_argument_list: ($) =>
       seq(
-        '<',
+        genericStart(),
         choice(
           seq(choice(repeat(','), commaSep1($.type)), alias(sym('_expression_generic_end'), '>')),
           seq(repeat(','), alias(sym('_definite_expression_generic_end'), '>')),
@@ -1129,7 +1154,7 @@ module.exports = grammar({
 
     _ambiguous_expression_arguments: ($) =>
       seq(
-        '<',
+        genericStart(),
         commaSep1(alias($._nongeneric_expression_type_argument, $.type)),
         choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
       ),
@@ -1162,7 +1187,7 @@ module.exports = grammar({
 
     _method_expression_arguments: ($) =>
       seq(
-        '<',
+        genericStart(),
         choice(
           repeat(','),
           seq(
@@ -1250,6 +1275,32 @@ module.exports = grammar({
 
     array_type: ($) => seq(field('type', $._array_base_type), field('rank', $.array_rank_specifier)),
 
+    _stackalloc_array_type: ($) =>
+      prec.dynamic(
+        1,
+        seq(
+          field(
+            'type',
+            choice(
+              alias($._stackalloc_array_type, $.array_type),
+              $._name,
+              alias($._stackalloc_nullable_type, $.nullable_type),
+              $.pointer_type,
+              $.function_pointer_type,
+              $.predefined_type,
+              $.tuple_type
+            )
+          ),
+          field('rank', $.array_rank_specifier)
+        )
+      ),
+
+    _stackalloc_nullable_type: ($) =>
+      seq(
+        field('type', choice(alias($._stackalloc_array_type, $.array_type), $._name, $.predefined_type, $.tuple_type)),
+        nullableQuestion()
+      ),
+
     _array_base_type: ($) =>
       choice(
         $.array_type,
@@ -1277,7 +1328,7 @@ module.exports = grammar({
         'delegate',
         '*',
         optional($.calling_convention),
-        '<',
+        genericStart(),
         repeat(seq($.function_pointer_parameter, ',')),
         field('returns', $.type),
         '>'
@@ -1412,17 +1463,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)),
@@ -1958,6 +2011,24 @@ module.exports = grammar({
         prec.right(
           PREC.COALESCING,
           seq(field('left', $.expression), field('operator', '??'), field('right', $.expression))
+        ),
+        ...binaryOperators().map(([operator, precedence]) =>
+          prec.left(
+            precedence,
+            seq(
+              field('left', $.expression),
+              field('operator', operator),
+              field('right', alias($._binary_typed_lambda_expression, $.lambda_expression))
+            )
+          )
+        ),
+        prec.right(
+          PREC.COALESCING,
+          seq(
+            field('left', $.expression),
+            field('operator', '??'),
+            field('right', alias($._binary_typed_lambda_expression, $.lambda_expression))
+          )
         )
       ),
 
@@ -2006,6 +2077,7 @@ module.exports = grammar({
         seq(
           field('condition', $.expression),
           ternaryQuestion(),
+          sym('_conditional_consequence_start'),
           field('consequence', $.expression),
           ':',
           sym('_conditional_alternative_start'),
@@ -2454,7 +2526,19 @@ module.exports = grammar({
     parenthesized_expression: ($) => seq('(', $.expression, ')'),
 
     lambda_expression: ($) =>
-      prec(-1, seq($._lambda_expression_init, '=>', field('body', choice($.block, $.expression)))),
+      prec(
+        -1,
+        choice(
+          seq($._lambda_expression_init, '=>', field('body', choice($.block, $.expression))),
+          seq($._typed_lambda_expression_init, '=>', field('body', choice($.block, $.expression)))
+        )
+      ),
+
+    _binary_typed_lambda_expression: ($) =>
+      prec(
+        1,
+        prec.dynamic(-1, seq($._typed_lambda_expression_init, '=>', field('body', choice($.block, $.expression))))
+      ),
 
     _lambda_expression_init: ($) =>
       prec(
@@ -2464,11 +2548,23 @@ module.exports = grammar({
           repeat(prec.dynamic(1, alias(choice('static', 'async'), $.modifier))),
           choice(
             field('parameters', prec(-1, alias($.identifier, sym('implicit_parameter')))),
-            seq(optional(field('type', $.type)), field('parameters', $._lambda_parameters))
+            prec(1, prec.dynamic(1, seq(field('type', $.ref_type), field('parameters', $._lambda_parameters)))),
+            field('parameters', $._lambda_parameters)
           )
         )
       ),
 
+    _typed_lambda_expression_init: ($) =>
+      prec(
+        -1,
+        seq(
+          repeat($._attribute_list),
+          repeat(prec.dynamic(1, alias(choice('static', 'async'), $.modifier))),
+          field('type', $.type),
+          field('parameters', $._lambda_parameters)
+        )
+      ),
+
     _lambda_parameters: ($) =>
       prec(
         -1,
@@ -2723,6 +2819,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 +3283,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.
  *
@@ -3325,12 +3456,21 @@ function arrayCreationExpression($, initializer) {
 }
 
 /**
- * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'type'>} $
+ * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'_stackalloc_array_type' | 'array_type' | 'type'>} $
  * @param {import('@willbooster/web-tree-sitter/dsl').Rule} initializer
  * @returns {import('@willbooster/web-tree-sitter/dsl').Rule}
  */
 function stackallocExpression($, initializer) {
-  return prec.left(seq('stackalloc', field('type', $.type), initializer));
+  return choice(
+    prec.left(seq('stackalloc', field('type', $.type), initializer)),
+    prec.right(
+      seq(
+        alias(sym('_stackalloc_context'), 'stackalloc'),
+        field('type', alias($._stackalloc_array_type, $.array_type)),
+        initializer
+      )
+    )
+  );
 }
 
 /**
@@ -3754,3 +3894,7 @@ function blockEnd() {
 function ampersandOperator() {
   return alias(sym('_ampersand_operator'), '&');
 }
+
+function genericStart() {
+  return choice('<', alias(sym('_expression_generic_start'), '<'));
+}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "15.0.0",
+  "version": "15.0.2",
   "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,22 +48,19 @@
   "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",
+    "@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": "^13.0.0"
@@ -68,9 +69,5 @@
     "@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

@@ -24,6 +24,9 @@
         "src/nullableTypes.h",
         "src/questionContext.h",
         "src/questionLiterals.h",
+        "src/questionOperands.h",
+        "src/questionState.h",
+        "src/questionSuffix.h",
         "src/tree_sitter/alloc.h",
         "src/tree_sitter/array.h",
         "src/tree_sitter/parser.h"
@@ -31,7 +34,7 @@
     }
   ],
   "metadata": {
-    "version": "15.0.0",
+    "version": "15.0.2",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [