@willbooster/tree-sitter-c-sharp 1.0.21 → 1.0.23

package/grammar.js

@@ -435,8 +435,6 @@ module.exports = grammar({
             '<',
             '>=',
             '<=',
-            // C# 14: user-defined compound assignment operators.
-            // https://learn.microsoft.com/en-us/dotnet/csharp/whats-new/csharp-14#user-defined-compound-assignment-operators
             '+=',
             '-=',
             '*=',
@@ -482,6 +480,7 @@ module.exports = grammar({
         $.delegate_declaration,
         $.field_declaration,
         $.method_declaration,
+        $.conditional_method_declaration,
         $.event_declaration,
         $.event_field_declaration,
         $.record_declaration,
@@ -502,14 +501,6 @@ module.exports = grammar({
     // and operators with a shared receiver inside a non-generic static class.
     // https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/proposals/csharp-14.0/extensions
     //
-    //   extension_declaration:
-    //     'extension' type_parameter_list? '(' receiver_parameter ')'
-    //         type_parameter_constraints_clause* extension_body
-    //   extension_body: '{' extension_member_declaration* '}' ';'?
-    //   extension_member_declaration:
-    //     method_declaration | property_declaration | operator_declaration
-    //   receiver_parameter: attributes? parameter_modifiers? type identifier?
-    //
     // `extension` is contextual; it is recognized as the start of an
     // extension declaration when followed by `<` or `(` in declaration
     // position. Use prec.dynamic so an identifier named `extension` in
@@ -535,7 +526,8 @@ module.exports = grammar({
 
     extension_body: ($) => seq('{', repeat($._extension_member_declaration), '}', optional(';')),
 
-    _extension_member_declaration: ($) => choice($.method_declaration, $.property_declaration, $.operator_declaration),
+    _extension_member_declaration: ($) =>
+      choice($.method_declaration, $.conditional_method_declaration, $.property_declaration, $.operator_declaration),
 
     field_declaration: ($) => seq(repeat($._attribute_list), repeat($.modifier), $.variable_declaration, ';'),
 
@@ -563,7 +555,13 @@ module.exports = grammar({
         $._function_body
       ),
 
-    method_declaration: ($) =>
+    method_declaration: ($) => seq($._method_signature, $._function_body),
+
+    conditional_method_declaration: ($) => seq(alias($.preproc_if_in_method_signature, $.preproc_if), $._function_body),
+
+    method_signature: ($) => $._method_signature,
+
+    _method_signature: ($) =>
       seq(
         repeat($._attribute_list),
         repeat($.modifier),
@@ -572,8 +570,7 @@ module.exports = grammar({
         field('name', $.identifier),
         field('type_parameters', optional($.type_parameter_list)),
         field('parameters', $.parameter_list),
-        repeat($.type_parameter_constraints_clause),
-        $._function_body
+        repeat($.type_parameter_constraints_clause)
       ),
 
     event_declaration: ($) =>
@@ -1018,7 +1015,6 @@ module.exports = grammar({
     // Invocation with name - creates conflict with recursive_pattern's Name(positional_pattern_clause)
     _name_invocation_pattern: ($) => seq(field('function', $._name), field('arguments', $.argument_list)),
 
-    // Invocation where function is not a simple name
     // One above `invocation_expression`, which reads the same tokens where both fit.
     _complex_invocation_expression: ($) =>
       prec(
@@ -1067,15 +1063,11 @@ module.exports = grammar({
         )
       ),
 
-    // C# 11 slice pattern: `..` optionally followed by a subpattern that
-    // binds the captured slice. `[a, .. var rest, z]`, `[..]` (bare),
-    // `[.. List<int> rest]` (declaration_pattern), etc.
     slice_pattern: ($) => prec.right(seq('..', optional($.pattern))),
 
     recursive_pattern: ($) =>
       prec.left(
         choice(
-          // name followed by positional pattern WITH variable designation
           prec.dynamic(
             1,
             seq(
@@ -1085,16 +1077,12 @@ module.exports = grammar({
               $._simple_designation
             )
           ),
-          // name followed by positional pattern WITHOUT variable designation
           prec.dynamic(
             -1,
             seq(field('type', $._name), $.positional_pattern_clause, optional($.property_pattern_clause))
           ),
-          // positional pattern with variable designation (no type prefix)
           prec.dynamic(1, seq($.positional_pattern_clause, $._simple_designation)),
-          // positional pattern without variable designation (no type prefix)
           $.positional_pattern_clause,
-          // other type followed by a property pattern clause
           seq(field('type', $.type), $.property_pattern_clause, optional($._simple_designation)),
           // A positional clause follows only a name (above), a predefined type, or an array type. Letting any type take
           // one reads `Name(A.B)` once more, through `type`; after a syntax error, the extra GLR versions then exceed
@@ -1166,10 +1154,6 @@ module.exports = grammar({
         $.typeof_expression,
         $.makeref_expression,
         $.ref_expression,
-        // Address-of (see `_address_of_expression` below): aliased to
-        // `prefix_unary_expression` to preserve the public AST shape.
-        // Parallels `_pointer_indirection_expression` (the `*` operator),
-        // which is similarly aliased back into `lvalue_expression`.
         alias($._address_of_expression, $.prefix_unary_expression),
         alias($._value_indirection_expression, $.prefix_unary_expression),
         $.reftype_expression,
@@ -1504,7 +1488,6 @@ module.exports = grammar({
         )
       ),
 
-    // inline
     _object_creation_type: ($) => choice($._name, $.nullable_type, $.predefined_type),
 
     parenthesized_expression: ($) => seq('(', $.non_lvalue_expression, ')'),
@@ -1626,7 +1609,7 @@ module.exports = grammar({
         seq(
           optional(seq(field('name', $.identifier), ':')),
           optional(choice('ref', 'out', 'in')),
-          choice($.expression, $.declaration_expression)
+          choice($.expression, prec.dynamic(-1, $.declaration_expression))
         )
       ),
 
@@ -1741,8 +1724,13 @@ module.exports = grammar({
         'yield'
       ),
 
-    // Preprocessor
-
+    ...preprocIf(
+      '_in_method_signature',
+      ($) => choice($.method_signature, alias($.preproc_if_in_method_signature, $.preproc_if)),
+      0,
+      false,
+      true
+    ),
     ...preprocIf('', ($) => $.declaration),
     ...preprocIf('_in_top_level', ($) => choice($._top_level_item_no_statement, $.statement)),
     ...preprocIf('_in_expression', ($) => $.expression, -2, false),
@@ -1885,8 +1873,6 @@ function directiveEnd($) {
 }
 
 /**
- * Creates a preprocessor regex rule
- *
  * @param {string} command
  *
  * @returns {AliasRule}
@@ -1905,9 +1891,11 @@ function preprocessor(command) {
  *
  * @param {boolean} rep
  *
+ * @param {boolean} required
+ *
  * @returns {RuleBuilders<string, string>}
  */
-function preprocIf(suffix, content, precedence = 0, rep = true) {
+function preprocIf(suffix, content, precedence = 0, rep = true, required = false) {
   /**
    *
    * @param {GrammarSymbols<string>} $
@@ -1929,14 +1917,17 @@ function preprocIf(suffix, content, precedence = 0, rep = true) {
           preprocessor('if'),
           field('condition', $._preproc_expression),
           /\n/,
-          rep ? repeat(content($)) : optional(content($)),
+          rep ? repeat(content($)) : required ? content($) : optional(content($)),
           field('alternative', optional(alternativeBlock($))),
           preprocessor('endif')
         )
       ),
 
     ['preproc_else' + suffix]: ($) =>
-      prec(precedence, seq(preprocessor('else'), rep ? repeat(content($)) : optional(content($)))),
+      prec(
+        precedence,
+        seq(preprocessor('else'), rep ? repeat(content($)) : required ? content($) : optional(content($)))
+      ),
 
     ['preproc_elif' + suffix]: ($) =>
       prec(
@@ -1945,7 +1936,7 @@ function preprocIf(suffix, content, precedence = 0, rep = true) {
           preprocessor('elif'),
           field('condition', $._preproc_expression),
           /\n/,
-          rep ? repeat(content($)) : optional(content($)),
+          rep ? repeat(content($)) : required ? content($) : optional(content($)),
           field('alternative', optional(alternativeBlock($)))
         )
       ),
@@ -1973,8 +1964,6 @@ function postfixOperand($) {
 }
 
 /**
- * Creates a rule to match one or more of the rules separated by a comma
- *
  * @param {Rule} rule
  *
  * @returns {SeqRule}
@@ -1984,8 +1973,6 @@ function commaSep1(rule) {
 }
 
 /**
- * Creates a rule to match two or more of the rules separated by a comma
- *
  * @param {Rule} rule
  *
  * @returns {SeqRule}
@@ -1995,8 +1982,6 @@ function commaSep2(rule) {
 }
 
 /**
- * Creates a rule to optionally match one or more of the rules separated by a comma
- *
  * @param {Rule} rule
  *
  * @returns {ChoiceRule}
@@ -2006,8 +1991,6 @@ function commaSep(rule) {
 }
 
 /**
- * Creates a rule to match one or more of the rules separated by `separator`
- *
  * @param {RuleOrLiteral} rule
  *
  * @param {RuleOrLiteral} separator
@@ -2019,8 +2002,6 @@ function sep1(rule, separator) {
 }
 
 /**
- * Creates a rule to optionally match one or more of the rules separated by `separator`
- *
  * @param {RuleOrLiteral} rule
  *
  * @param {RuleOrLiteral} separator

package/package.json

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

package/queries/highlights.scm

@@ -3,6 +3,7 @@
 ;; Methods
 
 (method_declaration name: (identifier) @function)
+(method_signature name: (identifier) @function)
 (local_function_statement name: (identifier) @function)
 
 ;; Types

package/queries/tags.scm

@@ -8,6 +8,8 @@
 
 (method_declaration name: (identifier) @name) @definition.method
 
+(method_signature name: (identifier) @name) @definition.method
+
 (object_creation_expression type: (identifier) @name) @reference.class
 
 (type_parameter_constraints_clause (identifier) @name) @reference.class

package/src/node-types.json

@@ -7,6 +7,10 @@
         "type": "class_declaration",
         "named": true
       },
+      {
+        "type": "conditional_method_declaration",
+        "named": true
+      },
       {
         "type": "constructor_declaration",
         "named": true
@@ -1856,6 +1860,36 @@
       }
     }
   },
+  {
+    "type": "conditional_method_declaration",
+    "named": true,
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "arrow_expression_clause",
+            "named": true
+          },
+          {
+            "type": "block",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "preproc_if",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "constant_pattern",
     "named": true,
@@ -2657,6 +2691,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "conditional_method_declaration",
+          "named": true
+        },
         {
           "type": "method_declaration",
           "named": true
@@ -4038,6 +4076,78 @@
       ]
     }
   },
+  {
+    "type": "method_signature",
+    "named": true,
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      },
+      "parameters": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "parameter_list",
+            "named": true
+          }
+        ]
+      },
+      "returns": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type_parameter_list",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "attribute_list",
+          "named": true
+        },
+        {
+          "type": "explicit_interface_specifier",
+          "named": true
+        },
+        {
+          "type": "modifier",
+          "named": true
+        },
+        {
+          "type": "preproc_if_in_attribute_list",
+          "named": true
+        },
+        {
+          "type": "type_parameter_constraints_clause",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "modifier",
     "named": true,
@@ -4801,6 +4911,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true
@@ -4848,6 +4962,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true
@@ -4973,6 +5091,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true

package/tree-sitter.json

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