@willbooster/tree-sitter-c-sharp 1.0.13 → 1.0.15

package/README.md

@@ -5,14 +5,15 @@
 [![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.26.0-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.28.6-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
 [tree-sitter/tree-sitter-c-sharp](https://github.com/tree-sitter/tree-sitter-c-sharp). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork fixes parsing bugs and raises conformance with the [C# language specification](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/readme).
+This fork fixes parsing bugs and raises conformance with the
+[C# language specification](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/readme).
 
 The grammar is based upon the Roslyn grammar with changes in order to:
 
@@ -75,7 +76,7 @@ const parser = new Parser();
 parser.setLanguage(await Language.load(cSharp));
 ```
 
-The package also ships the node types in `src/node-types.json`.
+The package also ships the queries in `queries/` and the node types in `src/node-types.json`.
 
 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
@@ -104,25 +105,38 @@ 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`): `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 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
   `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 of 10,000 lines takes
-  linear time, 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 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 `package.json` and `Cargo.lock` test the same runtime version (`test/unit/runtimeVersion.test.ts`);
 - checks that the Wasm build parses C# with @willbooster/web-tree-sitter in Chromium (`test/unit/browser.test.ts`,
   which needs Chromium installed once by `bunx playwright install chromium`) and in Cloudflare Workers with and without
   `nodejs_compat` (`test/unit/workers.test.ts`).
 
-`cargo test` also replays edits that `tree-sitter fuzz` found to break incremental parsing, with the
-willbooster-tree-sitter runtime that fixes them; `tree-sitter fuzz` itself runs the runtime built into tree-sitter-cli.
+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. `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.
 
 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 on the willbooster-tree-sitter runtime locked in `Cargo.lock`
@@ -131,6 +145,7 @@ parser with libFuzzer and sanitizers on the willbooster-tree-sitter runtime lock
 ### References
 
 - [C# language specification](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/readme)
-- [Official C# 8 Draft Language Spec](https://github.com/dotnet/csharpstandard/tree/draft-v8/standard) provides chapters that formally define the language grammar.
+- [Official C# 8 Draft Language Spec](https://github.com/dotnet/csharpstandard/tree/draft-v8/standard) provides
+  chapters that formally define the language grammar.
 - [Roslyn C# language grammar export](https://github.com/dotnet/roslyn/blob/master/src/Compilers/CSharp/Portable/Generated/CSharp.Generated.g4)
 - [SharpLab](https://sharplab.io) (web-based syntax tree playground based on Roslyn)

package/grammar.js

@@ -137,6 +137,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: ($) => [
@@ -1766,9 +1767,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 +1795,7 @@ module.exports = grammar({
             $.string_literal
           )
         ),
-        /\n/
+        directiveEnd($)
       ),
 
     preproc_pragma: ($) =>
@@ -1803,24 +1805,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 +1830,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.13",
+  "version": "1.0.15",
   "description": "C# grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -16,13 +16,14 @@
   "author": "WillBooster Inc.",
   "files": [
     "grammar.js",
+    "queries/*.scm",
     "tree-sitter.json",
     "src/node-types.json",
     "*.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",
@@ -30,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"
@@ -44,13 +46,13 @@
     "@vitest/browser-playwright": "5.0.1",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.13.0",
-    "@willbooster/web-tree-sitter": "1.0.7",
+    "@willbooster/wb": "22.13.1",
+    "@willbooster/web-tree-sitter": "1.0.17",
     "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/queries/highlights.scm

@@ -0,0 +1,214 @@
+(identifier) @variable
+
+;; Methods
+
+(method_declaration name: (identifier) @function)
+(local_function_statement name: (identifier) @function)
+
+;; Types
+
+(interface_declaration name: (identifier) @type)
+(class_declaration name: (identifier) @type)
+(enum_declaration name: (identifier) @type)
+(struct_declaration (identifier) @type)
+(record_declaration (identifier) @type)
+(namespace_declaration name: (identifier) @module)
+
+(generic_name (identifier) @type)
+(type_parameter (identifier) @property.definition)
+(parameter type: (identifier) @type)
+(type_argument_list (identifier) @type)
+(as_expression right: (identifier) @type)
+(is_expression right: (identifier) @type)
+
+(constructor_declaration name: (identifier) @constructor)
+(destructor_declaration name: (identifier) @constructor)
+
+(_ type: (identifier) @type)
+
+(base_list (identifier) @type)
+
+(predefined_type) @type.builtin
+
+;; Enum
+(enum_member_declaration (identifier) @property.definition)
+
+;; Literals
+
+[
+  (real_literal)
+  (integer_literal)
+] @number
+
+[
+  (character_literal)
+  (string_literal)
+  (raw_string_literal)
+  (verbatim_string_literal)
+  (interpolated_string_expression)
+  (interpolation_start)
+  (interpolation_quote)
+ ] @string
+
+(escape_sequence) @string.escape
+
+[
+  (boolean_literal)
+  (null_literal)
+] @constant.builtin
+
+;; Comments
+
+(comment) @comment
+
+;; Tokens
+
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "--"
+  "-"
+  "-="
+  "&"
+  "&="
+  "&&"
+  "+"
+  "++"
+  "+="
+  "<"
+  "<="
+  "<<"
+  "<<="
+  "="
+  "=="
+  "!"
+  "!="
+  "=>"
+  ">"
+  ">="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "|"
+  "|="
+  "||"
+  "?"
+  "??"
+  "??="
+  "^"
+  "^="
+  "~"
+  "*"
+  "*="
+  "/"
+  "/="
+  "%"
+  "%="
+  ":"
+  ".."
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  (interpolation_brace)
+]  @punctuation.bracket
+
+;; Keywords
+
+[
+  (modifier)
+  "this"
+  (implicit_type)
+] @keyword
+
+[
+  "add"
+  "alias"
+  "as"
+  "base"
+  "break"
+  "case"
+  "catch"
+  "checked"
+  "class"
+  "continue"
+  "default"
+  "delegate"
+  "do"
+  "else"
+  "enum"
+  "event"
+  "explicit"
+  "extern"
+  "finally"
+  "for"
+  "foreach"
+  "global"
+  "goto"
+  "if"
+  "implicit"
+  "interface"
+  "is"
+  "lock"
+  "namespace"
+  "notnull"
+  "operator"
+  "params"
+  "return"
+  "remove"
+  "sizeof"
+  "stackalloc"
+  "static"
+  "struct"
+  "switch"
+  "throw"
+  "try"
+  "typeof"
+  "unchecked"
+  "using"
+  "while"
+  "new"
+  "await"
+  "in"
+  "yield"
+  "get"
+  "set"
+  "when"
+  "out"
+  "ref"
+  "from"
+  "where"
+  "select"
+  "record"
+  "init"
+  "with"
+  "let"
+  "unsafe"
+] @keyword
+
+;; Attribute
+
+(attribute name: (identifier) @attribute)
+
+;; Parameters
+
+(parameter
+  name: (identifier) @variable.parameter)
+
+;; Type constraints
+
+(type_parameter_constraints_clause (identifier) @property.definition)
+
+;; Method calls
+
+(invocation_expression (member_access_expression name: (identifier) @function))

package/queries/tags.scm

@@ -0,0 +1,23 @@
+(class_declaration name: (identifier) @name) @definition.class
+
+(class_declaration (base_list (_) @name)) @reference.class
+
+(interface_declaration name: (identifier) @name) @definition.interface
+
+(interface_declaration (base_list (_) @name)) @reference.interface
+
+(method_declaration name: (identifier) @name) @definition.method
+
+(object_creation_expression type: (identifier) @name) @reference.class
+
+(type_parameter_constraints_clause (identifier) @name) @reference.class
+
+(type_parameter_constraint type: (identifier) @name) @reference.class
+
+(variable_declaration type: (identifier) @name) @reference.class
+
+(invocation_expression function: (member_access_expression name: (identifier) @name)) @reference.send
+
+(namespace_declaration name: (identifier) @name) @definition.module
+
+(namespace_declaration name: (identifier) @name) @module

package/tree-sitter.json

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