@willbooster/tree-sitter-c-sharp 4.0.0 → 5.0.1

package/README.md

@@ -77,6 +77,8 @@ parser.setLanguage(await Language.load(cSharp));
 ```
 
 The package also ships the queries in `queries/` and the node types in `src/node-types.json`.
+When extending the source grammar, use `grammar.js` and `src/scanner.c` from the same repository release tag.
+Their external directive 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
@@ -85,7 +87,7 @@ fuzzed with. The parser requires runtime 2.0.0 or later:
 ```toml
 [dependencies]
 tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
-tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "4" }
+tree-sitter-c-sharp = { package = "willbooster-tree-sitter-c-sharp", version = "5" }
 ```
 
 ```rust

package/grammar.js

@@ -152,8 +152,18 @@ module.exports = grammar({
     // modifier) closed by ')=>'.
     $._lambda_paren_open,
     $._end_of_input,
-    $._directive_crlf,
+    $._directive_newline,
     $._file_directive_preproc_arg,
+    $._file_directive_sdk,
+    $._file_directive_package,
+    $._file_directive_property,
+    $._file_directive_project,
+    $._file_directive_ref,
+    $._file_directive_include,
+    $._file_directive_exclude,
+    $.file_directive_kind,
+    $._file_directive_literal_context,
+    $._file_directive_newline,
   ],
 
   extras: ($) => [
@@ -1508,23 +1518,43 @@ module.exports = grammar({
       choice(alias($.interpolation_string_content, $.string_content), $.escape_sequence, $.interpolation),
 
     _interpolated_verbatim_string_content: ($) =>
-      choice(alias($.interpolation_string_content, $.string_content), $.interpolation),
+      choice(
+        alias($.interpolation_string_content, $.string_content),
+        alias($._multiline_interpolation, $.interpolation)
+      ),
 
     _interpolated_raw_string_content: ($) =>
-      choice(alias($.interpolation_string_content, $.string_content), $.interpolation),
+      choice(
+        alias($.interpolation_string_content, $.string_content),
+        alias($._multiline_interpolation, $.interpolation)
+      ),
 
     interpolation: ($) =>
       seq(
         alias($.interpolation_open_brace, $.interpolation_brace),
         $.expression,
         optional($.interpolation_alignment_clause),
-        optional($.interpolation_format_clause),
-        alias($.interpolation_close_brace, $.interpolation_brace)
+        choice(
+          alias($.interpolation_close_brace, $.interpolation_brace),
+          seq($.interpolation_format_clause, alias(token.immediate('}'), $.interpolation_brace))
+        )
       ),
 
     interpolation_alignment_clause: ($) => seq(',', $.expression),
 
-    interpolation_format_clause: () => seq(':', /[^}"]+/),
+    interpolation_format_clause: ($) =>
+      seq(':', optional($._file_directive_literal_context), token.immediate(/[^}"\n\r\u0085\u2028\u2029]+/)),
+
+    _multiline_interpolation: ($) =>
+      seq(
+        alias($.interpolation_open_brace, $.interpolation_brace),
+        $.expression,
+        optional($.interpolation_alignment_clause),
+        optional(alias($._multiline_interpolation_format_clause, $.interpolation_format_clause)),
+        alias($.interpolation_close_brace, $.interpolation_brace)
+      ),
+
+    _multiline_interpolation_format_clause: ($) => seq(':', optional($._file_directive_literal_context), /[^}"]+/),
 
     member_access_expression: ($) =>
       prec(
@@ -1719,7 +1749,7 @@ module.exports = grammar({
     string_literal: ($) =>
       seq(
         '"',
-        repeat(choice($.string_literal_content, $.escape_sequence)),
+        repeat(choice($.string_literal_content, $.escape_sequence, $._file_directive_literal_context)),
         token.immediate('"'),
         optional($.string_literal_encoding)
       ),
@@ -1896,6 +1926,7 @@ module.exports = grammar({
         repeat(
           choice(
             $.string_literal_content,
+            $._file_directive_literal_context,
             alias(token.immediate(prec(-1, '\\')), $.string_literal_content),
             alias(
               token.immediate(
@@ -1959,25 +1990,17 @@ module.exports = grammar({
         choice(
           fileDirectiveArguments(
             $,
-            choice(
-              alias(token(prec(-2, /#:[sS][dD][kK]/)), '#:sdk'),
-              alias(token(prec(-2, /#:[pP][aA][cC][kK][aA][gG][eE]/)), '#:package')
-            ),
+            choice(alias($._file_directive_sdk, '#:sdk'), alias($._file_directive_package, '#:package')),
             '@',
             'metadata'
           ),
-          fileDirectiveArguments(
-            $,
-            alias(token(prec(-2, /#:[pP][rR][oO][pP][eE][rR][tT][yY]/)), '#:property'),
-            '=',
-            'value'
-          ),
+          fileDirectiveArguments($, alias($._file_directive_property, '#: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')
+              alias($._file_directive_project, '#:project'),
+              alias($._file_directive_ref, '#:ref'),
+              alias($._file_directive_include, '#:include'),
+              alias($._file_directive_exclude, '#:exclude')
             ),
             optional(seq($._file_directive_spacing, field('value', $.file_directive_value)))
           ),
@@ -1987,11 +2010,9 @@ module.exports = grammar({
           )
         ),
         optional($._file_directive_spacing),
-        choice(token.immediate(new RegExp(String.raw`\r\n|[${directiveLineBreak}]`)), $._end_of_input)
+        choice($._file_directive_newline, $._end_of_input)
       ),
 
-    file_directive_kind: () => token(prec(-2, new RegExp(`#:[^${directiveWhitespace}]*`))),
-
     _file_directive_spacing: () => token.immediate(prec(1, new RegExp(`[${directiveHorizontal}]+`))),
     file_directive_name: () =>
       token.immediate(
@@ -2068,7 +2089,7 @@ function directiveEnd($) {
 
 /** @param {GrammarSymbols<string>} $ */
 function directiveNewLine($) {
-  return choice($._directive_crlf, /[\r\n\u0085\u2028\u2029]/);
+  return $._directive_newline;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "4.0.0",
+  "version": "5.0.1",
   "description": "C# grammar for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

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