@willbooster/tree-sitter-c-sharp 1.0.14 → 1.0.16

package/README.md

@@ -105,13 +105,17 @@ script/parse-examples
 cargo test
 ```
 
+`script/tree-sitter` (also `bun run tree-sitter`) runs the tree-sitter CLI of WillBooster/tree-sitter at the runtime
+version locked in `Cargo.lock`, so the parser is generated, built, tested, and fuzzed with the generator and the
+runtime this package ships. The first run downloads that CLI from its GitHub Release into `.tmp/`, or builds it with
+`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 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`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
-  edits each corpus case at random, reparses it, undoes the edits, and reparses again, on the WillBooster/tree-sitter
-  runtime version locked in `Cargo.lock` (the first run downloads that CLI from its GitHub Release, or builds it with
-  `cargo` when the download fails or the release has no binary that runs here). `TREE_SITTER_SEED`,
+  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 the real-world C# 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
@@ -127,7 +131,9 @@ cargo test
   `nodejs_compat` (`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; `script/fuzz-corpus` builds a per-run parser in `.tmp/fuzz` and deletes it afterwards.
+by every checkout; `script/fuzz-corpus` builds a per-run parser in `.tmp/fuzz` and deletes it afterwards. `mise.toml`
+sets `TREE_SITTER_LIBDIR` to `.tmp/tree-sitter-lib` as well, so other `tree-sitter` commands run in the checkout use
+this checkout's parser too.
 
 `cargo test` also replays edits that `tree-sitter fuzz` found to break incremental parsing on runtimes without the
 fixes of willbooster-tree-sitter.

package/grammar.js

@@ -45,6 +45,7 @@ module.exports = grammar({
   name: 'c_sharp',
 
   conflicts: ($) => [
+    [$.modifier, $._constructor_declaration_initializer, $._reserved_identifier],
     [$._simple_name, $.generic_name],
     [$._simple_name, $.type_parameter],
     [$._simple_name, $.subpattern],
@@ -137,6 +138,7 @@ module.exports = grammar({
     // simple-lambda parameter list (at least one element has a parameter
     // modifier) closed by ')=>'.
     $._lambda_paren_open,
+    $._end_of_input,
   ],
 
   extras: ($) => [
@@ -266,7 +268,7 @@ module.exports = grammar({
       seq(
         repeat($._attribute_list),
         repeat($.modifier),
-        optional('ref'),
+        optional(seq('ref', optional(alias('partial', $.modifier)))),
         'struct',
         field('name', $.identifier),
         repeat(choice($.type_parameter_list, $.parameter_list, $.base_list)),
@@ -535,7 +537,10 @@ module.exports = grammar({
     _constructor_declaration_initializer: ($) =>
       seq(
         repeat($._attribute_list),
-        repeat($.modifier),
+        choice(
+          repeat($.modifier),
+          prec.dynamic(1, seq(repeat($.modifier), alias('partial', $.modifier), repeat($.modifier)))
+        ),
         field('name', $.identifier),
         field('parameters', $.parameter_list),
         optional($.constructor_initializer)
@@ -1704,6 +1709,7 @@ module.exports = grammar({
         'on',
         'orderby',
         'param',
+        'partial',
         'property',
         'scoped',
         'select',
@@ -1766,9 +1772,10 @@ module.exports = grammar({
       );
     },
 
-    preproc_region: ($) => seq(preprocessor('region'), optional(field('content', $.preproc_arg)), /\n/),
+    preproc_region: ($) => seq(preprocessor('region'), optional(field('content', $.preproc_arg)), directiveEnd($)),
 
-    preproc_endregion: ($) => seq(preprocessor('endregion'), optional(field('content', $.preproc_arg)), /\n/),
+    preproc_endregion: ($) =>
+      seq(preprocessor('endregion'), optional(field('content', $.preproc_arg)), directiveEnd($)),
 
     preproc_line: ($) =>
       seq(
@@ -1793,7 +1800,7 @@ module.exports = grammar({
             $.string_literal
           )
         ),
-        /\n/
+        directiveEnd($)
       ),
 
     preproc_pragma: ($) =>
@@ -1803,24 +1810,24 @@ module.exports = grammar({
           seq('warning', choice('disable', 'restore'), commaSep(choice($.identifier, $.integer_literal))),
           seq('checksum', $.string_literal, $.string_literal, $.string_literal)
         ),
-        /\n/
+        directiveEnd($)
       ),
 
-    preproc_nullable: () =>
+    preproc_nullable: ($) =>
       seq(
         preprocessor('nullable'),
         choice('enable', 'disable', 'restore'),
         optional(choice('annotations', 'warnings')),
-        /\n/
+        directiveEnd($)
       ),
 
-    preproc_error: ($) => seq(preprocessor('error'), $.preproc_arg, /\n/),
+    preproc_error: ($) => seq(preprocessor('error'), $.preproc_arg, directiveEnd($)),
 
-    preproc_warning: ($) => seq(preprocessor('warning'), $.preproc_arg, /\n/),
+    preproc_warning: ($) => seq(preprocessor('warning'), $.preproc_arg, directiveEnd($)),
 
-    preproc_define: ($) => seq(preprocessor('define'), $.preproc_arg, /\n/),
+    preproc_define: ($) => seq(preprocessor('define'), $.preproc_arg, directiveEnd($)),
 
-    preproc_undef: ($) => seq(preprocessor('undef'), $.preproc_arg, /\n/),
+    preproc_undef: ($) => seq(preprocessor('undef'), $.preproc_arg, directiveEnd($)),
 
     shebang_directive: () => token(seq('#!', /.*/)),
 
@@ -1828,6 +1835,18 @@ module.exports = grammar({
   },
 });
 
+/**
+ * Ends a directive that opens no conditional section: at a line break, or at the end of the input, which a file may
+ * reach without a final line break.
+ *
+ * @param {GrammarSymbols<string>} $
+ *
+ * @returns {ChoiceRule}
+ */
+function directiveEnd($) {
+  return choice(/\n/, $._end_of_input);
+}
+
 /**
  * Creates a preprocessor regex rule
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "C# grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -22,8 +22,8 @@
     "*.wasm"
   ],
   "scripts": {
-    "build-wasm": "tree-sitter build --wasm",
-    "build/ci": "tree-sitter generate && tree-sitter build --wasm",
+    "build-wasm": "script/tree-sitter build --wasm",
+    "build/ci": "script/tree-sitter generate && script/tree-sitter build --wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
     "lint": "bun wb lint",
@@ -31,10 +31,11 @@
     "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",
+    "tree-sitter": "script/tree-sitter",
     "typecheck": "bun wb typecheck",
     "verify": "bun wb verify",
     "verify-full": "bun wb verify --full"
@@ -46,7 +47,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.13.1",
-    "@willbooster/web-tree-sitter": "1.0.12",
+    "@willbooster/web-tree-sitter": "1.0.17",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",

package/tree-sitter.json

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