@willbooster/tree-sitter-c-sharp 1.0.25 → 2.0.0

package/README.md

@@ -31,13 +31,16 @@ Known gaps:
 - A pointer dereference can be assigned to only when its operand is a variable, an address, a parenthesized or
   postfix expression, or a cast of one of these or of an invocation (`*p = 1`, `*(p + 1) = 1`, `*(int*)p = 1`,
   `*dst++ = 1`); `*++p = 1` and `*f() = 1` are not recognized
-- File-based apps preprocessor directives (`#:property`, `#:package`, `#:sdk`, `#:project`) are not yet recognized
 
 ## Usage
 
 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. In Node.js and Bun, load it from the package:
+browsers, and Cloudflare Workers. Use runtime version 1.1.2 or later: browser loading requires its asynchronous
+instantiation support for this grammar. 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';
@@ -85,8 +88,8 @@ fuzzed with, whose fixes keep incremental reparses consistent with fresh parses
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "1.0.4" }
-tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "1.1.2" }
+tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "2" }
 ```
 
 ```rust

package/grammar.js

@@ -36,6 +36,10 @@ const PREC = {
   SELECT: 0,
 };
 
+const directiveHorizontal = String.raw` \t\v\f\u00A0\u1680\u2000-\u200A\u202F\u205F\u3000\uFEFF`;
+const directiveLineBreak = String.raw`\r\n\u0085\u2028\u2029`;
+const directiveWhitespace = directiveHorizontal + directiveLineBreak;
+
 const decimalDigitSequence = /([0-9][0-9_]*[0-9]|[0-9])/;
 
 const stringEncoding = /(u|U)8/;
@@ -147,6 +151,7 @@ module.exports = grammar({
     $._lambda_paren_open,
     $._end_of_input,
     $._directive_crlf,
+    $._file_directive_preproc_arg,
   ],
 
   extras: ($) => [
@@ -161,6 +166,7 @@ module.exports = grammar({
     $.preproc_warning,
     $.preproc_define,
     $.preproc_undef,
+    $.file_directive,
   ],
 
   inline: ($) => [
@@ -1628,9 +1634,9 @@ module.exports = grammar({
 
     null_literal: () => 'null',
 
-    character_literal: ($) => seq("'", choice($.character_literal_content, $.escape_sequence), "'"),
+    character_literal: ($) => seq("'", choice($.character_literal_content, $.escape_sequence), token.immediate("'")),
 
-    character_literal_content: () => token.immediate(/[^'\\]/),
+    character_literal_content: () => token.immediate(/[^'\\\r\n\u0085\u2028\u2029]/),
 
     integer_literal: () =>
       token(
@@ -1658,12 +1664,17 @@ module.exports = grammar({
     },
 
     string_literal: ($) =>
-      seq('"', repeat(choice($.string_literal_content, $.escape_sequence)), '"', optional($.string_literal_encoding)),
+      seq(
+        '"',
+        repeat(choice($.string_literal_content, $.escape_sequence)),
+        token.immediate('"'),
+        optional($.string_literal_encoding)
+      ),
 
-    string_literal_content: () => token.immediate(prec(1, /[^"\\\n]+/)),
+    string_literal_content: () => token.immediate(prec(1, /[^"\\\r\n\u0085\u2028\u2029]+/)),
 
     escape_sequence: () =>
-      token(choice(/\\x[0-9a-fA-F]{1,4}/, /\\u[0-9a-fA-F]{4}/, /\\U[0-9a-fA-F]{8}/, /\\[abefnrtv'"\\?0]/)),
+      token.immediate(choice(/\\x[0-9a-fA-F]{1,4}/, /\\u[0-9a-fA-F]{4}/, /\\U[0-9a-fA-F]{8}/, /\\[abefnrtv'"\\?0]/)),
 
     string_literal_encoding: () => token.immediate(stringEncoding),
 
@@ -1743,6 +1754,7 @@ module.exports = grammar({
         token(prec(-1, /[^\s\u0085\u2028\u2029]([^/\r\n\u0085\u2028\u2029]|\/[^*\r\n\u0085\u2028\u2029])*/)),
         optional($._preproc_arg_slash)
       ),
+    _file_directive_argument: ($) => seq($._file_directive_preproc_arg, optional($._preproc_arg_slash)),
     _preproc_arg_slash: () => token.immediate(/\//),
     preproc_directive: () => /#[ \t]*[a-zA-Z0-9]\w*/,
 
@@ -1785,10 +1797,19 @@ module.exports = grammar({
       );
     },
 
-    preproc_region: ($) => seq(preprocessor('region'), optional(field('content', $.preproc_arg)), directiveEnd($)),
+    preproc_region: ($) =>
+      seq(
+        preprocessor('region'),
+        optional(field('content', choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)))),
+        directiveEnd($)
+      ),
 
     preproc_endregion: ($) =>
-      seq(preprocessor('endregion'), optional(field('content', $.preproc_arg)), directiveEnd($)),
+      seq(
+        preprocessor('endregion'),
+        optional(field('content', choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)))),
+        directiveEnd($)
+      ),
 
     preproc_line: ($) =>
       seq(
@@ -1821,7 +1842,7 @@ module.exports = grammar({
         '"',
         repeat(
           choice(
-            alias(token.immediate(prec(1, /[^"\\\r\n\u0085\u2028\u2029]+/)), $.string_literal_content),
+            $.string_literal_content,
             alias(token.immediate(prec(-1, '\\')), $.string_literal_content),
             alias(
               token.immediate(
@@ -1852,13 +1873,92 @@ module.exports = grammar({
         directiveEnd($)
       ),
 
-    preproc_error: ($) => seq(preprocessor('error'), $.preproc_arg, directiveEnd($)),
+    preproc_error: ($) =>
+      seq(
+        preprocessor('error'),
+        choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)),
+        directiveEnd($)
+      ),
 
-    preproc_warning: ($) => seq(preprocessor('warning'), $.preproc_arg, directiveEnd($)),
+    preproc_warning: ($) =>
+      seq(
+        preprocessor('warning'),
+        choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)),
+        directiveEnd($)
+      ),
+
+    preproc_define: ($) =>
+      seq(
+        preprocessor('define'),
+        choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)),
+        directiveEnd($)
+      ),
+
+    preproc_undef: ($) =>
+      seq(
+        preprocessor('undef'),
+        choice($.preproc_arg, alias($._file_directive_argument, $.preproc_arg)),
+        directiveEnd($)
+      ),
+
+    file_directive: ($) =>
+      seq(
+        choice(
+          fileDirectiveArguments(
+            $,
+            choice(
+              alias(token(prec(-2, /#:[sS][dD][kK]/)), '#:sdk'),
+              alias(token(prec(-2, /#:[pP][aA][cC][kK][aA][gG][eE]/)), '#:package')
+            ),
+            '@',
+            'metadata'
+          ),
+          fileDirectiveArguments(
+            $,
+            alias(token(prec(-2, /#:[pP][rR][oO][pP][eE][rR][tT][yY]/)), '#: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')
+            ),
+            optional(seq($._file_directive_spacing, field('value', $.file_directive_value)))
+          ),
+          seq(
+            $.file_directive_kind,
+            optional(seq($._file_directive_spacing, optional(field('value', $.file_directive_value))))
+          )
+        ),
+        optional($._file_directive_spacing),
+        choice(token.immediate(new RegExp(String.raw`\r\n|[${directiveLineBreak}]`)), $._end_of_input)
+      ),
 
-    preproc_define: ($) => seq(preprocessor('define'), $.preproc_arg, directiveEnd($)),
+    file_directive_kind: () => token(prec(-2, new RegExp(`#:[^${directiveWhitespace}]*`))),
 
-    preproc_undef: ($) => seq(preprocessor('undef'), $.preproc_arg, directiveEnd($)),
+    _file_directive_spacing: () => token.immediate(prec(1, new RegExp(`[${directiveHorizontal}]+`))),
+    file_directive_name: () =>
+      token.immediate(
+        prec(
+          2,
+          choice(
+            new RegExp(`[^${directiveWhitespace}@="]+`),
+            new RegExp(String.raw`"([^"\\${directiveLineBreak}]|\\[^${directiveLineBreak}])*"`)
+          )
+        )
+      ),
+    file_directive_value: () =>
+      token.immediate(
+        prec(
+          1,
+          new RegExp(
+            `[^${directiveWhitespace}]([^${directiveLineBreak}]*[^${directiveWhitespace}])?|//[^${directiveLineBreak}]*`
+          )
+        )
+      ),
 
     shebang_directive: () => token(seq('#!', /[^\r\n\u0085\u2028\u2029]*/)),
 
@@ -1866,6 +1966,41 @@ module.exports = grammar({
   },
 });
 
+/**
+ * @param {GrammarSymbols<string>} $
+ * @param {Rule} kind
+ * @param {string} separator
+ * @param {string} extraField
+ * @returns {SeqRule}
+ */
+function fileDirectiveArguments($, kind, separator, extraField) {
+  return seq(
+    kind,
+    optional(
+      seq(
+        $._file_directive_spacing,
+        choice(
+          seq(
+            field('name', $.file_directive_name),
+            optional(
+              choice(
+                seq(
+                  optional($._file_directive_spacing),
+                  token.immediate(prec(2, separator)),
+                  optional($._file_directive_spacing),
+                  optional(field('value', $.file_directive_value))
+                ),
+                seq(optional($._file_directive_spacing), field(extraField, $.file_directive_value))
+              )
+            )
+          ),
+          field('value', $.file_directive_value)
+        )
+      )
+    )
+  );
+}
+
 /**
  * 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "1.0.25",
+  "version": "2.0.0",
   "description": "C# grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,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.17",
+    "@willbooster/web-tree-sitter": "1.1.2",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
@@ -63,7 +63,7 @@
     "wrangler": "4.135.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^1.0.0"
+    "@willbooster/web-tree-sitter": "^1.1.2"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/queries/highlights.scm

@@ -213,3 +213,9 @@
 ;; Method calls
 
 (invocation_expression (member_access_expression name: (identifier) @function))
+
+["#:sdk" "#:package" "#:property" "#:project" "#:ref" "#:include" "#:exclude"] @keyword.directive
+(file_directive_name) @property
+(file_directive_value) @string
+
+(file_directive_kind) @keyword.directive

package/src/node-types.json

@@ -2788,6 +2788,53 @@
       ]
     }
   },
+  {
+    "type": "file_directive",
+    "named": true,
+    "extra": true,
+    "fields": {
+      "metadata": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "file_directive_value",
+            "named": true
+          }
+        ]
+      },
+      "name": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "file_directive_name",
+            "named": true
+          }
+        ]
+      },
+      "value": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "file_directive_value",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "file_directive_kind",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "file_scoped_namespace_declaration",
     "named": true,
@@ -6711,6 +6758,34 @@
     "type": "\"",
     "named": false
   },
+  {
+    "type": "#:exclude",
+    "named": false
+  },
+  {
+    "type": "#:include",
+    "named": false
+  },
+  {
+    "type": "#:package",
+    "named": false
+  },
+  {
+    "type": "#:project",
+    "named": false
+  },
+  {
+    "type": "#:property",
+    "named": false
+  },
+  {
+    "type": "#:ref",
+    "named": false
+  },
+  {
+    "type": "#:sdk",
+    "named": false
+  },
   {
     "type": "#define",
     "named": false
@@ -6927,6 +7002,10 @@
     "type": "??=",
     "named": false
   },
+  {
+    "type": "@",
+    "named": false
+  },
   {
     "type": "Cdecl",
     "named": false
@@ -7132,6 +7211,18 @@
     "type": "file",
     "named": false
   },
+  {
+    "type": "file_directive_kind",
+    "named": true
+  },
+  {
+    "type": "file_directive_name",
+    "named": true
+  },
+  {
+    "type": "file_directive_value",
+    "named": true
+  },
   {
     "type": "finally",
     "named": false

package/tree-sitter.json

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