@willbooster/tree-sitter-c-sharp 1.0.22 → 1.0.24

package/grammar.js

@@ -146,10 +146,11 @@ module.exports = grammar({
     // modifier) closed by ')=>'.
     $._lambda_paren_open,
     $._end_of_input,
+    $._directive_crlf,
   ],
 
   extras: ($) => [
-    /[\s\u00A0\uFEFF\u3000]+/,
+    /[\s\u0085\u00A0\u2028\u2029\uFEFF\u3000]+/,
     $.comment,
     $.preproc_region,
     $.preproc_endregion,
@@ -480,6 +481,7 @@ module.exports = grammar({
         $.delegate_declaration,
         $.field_declaration,
         $.method_declaration,
+        $.conditional_method_declaration,
         $.event_declaration,
         $.event_field_declaration,
         $.record_declaration,
@@ -525,7 +527,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, ';'),
 
@@ -553,7 +556,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),
@@ -562,8 +571,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: ($) =>
@@ -1717,13 +1725,25 @@ module.exports = grammar({
         'yield'
       ),
 
+    ...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),
     ...preprocIf('_in_enum_member_declaration', ($) => $.enum_member_declaration, 0, false),
     ...preprocIf('_in_attribute_list', ($) => $.attribute_list, -1, false),
 
-    preproc_arg: () => token(prec(-1, /\S([^/\n]|\/[^*]|\\\r?\n)*/)),
+    preproc_arg: ($) =>
+      seq(
+        token(prec(-1, /[^\s\u0085\u2028\u2029]([^/\r\n\u0085\u2028\u2029]|\/[^*\r\n\u0085\u2028\u2029]|\\\r?\n)*/)),
+        optional($._preproc_arg_slash)
+      ),
+    _preproc_arg_slash: () => token.immediate(/\//),
     preproc_directive: () => /#[ \t]*[a-zA-Z0-9]\w*/,
 
     _preproc_expression: ($) =>
@@ -1840,9 +1860,9 @@ module.exports = grammar({
 
     preproc_undef: ($) => seq(preprocessor('undef'), $.preproc_arg, directiveEnd($)),
 
-    shebang_directive: () => token(seq('#!', /.*/)),
+    shebang_directive: () => token(seq('#!', /[^\r\n\u0085\u2028\u2029]*/)),
 
-    comment: () => token(choice(seq('//', /[^\n\r]*/), seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/'))),
+    comment: () => token(choice(seq('//', /[^\r\n\u0085\u2028\u2029]*/), seq('/*', /[^*]*\*+([^/*][^*]*\*+)*/, '/'))),
   },
 });
 
@@ -1855,7 +1875,12 @@ module.exports = grammar({
  * @returns {ChoiceRule}
  */
 function directiveEnd($) {
-  return choice(/\n/, $._end_of_input);
+  return choice(directiveNewLine($), $._end_of_input);
+}
+
+/** @param {GrammarSymbols<string>} $ */
+function directiveNewLine($) {
+  return choice($._directive_crlf, /[\r\n\u0085\u2028\u2029]/);
 }
 
 /**
@@ -1877,9 +1902,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>} $
@@ -1900,15 +1927,18 @@ function preprocIf(suffix, content, precedence = 0, rep = true) {
         seq(
           preprocessor('if'),
           field('condition', $._preproc_expression),
-          /\n/,
-          rep ? repeat(content($)) : optional(content($)),
+          directiveNewLine($),
+          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(
@@ -1916,8 +1946,8 @@ function preprocIf(suffix, content, precedence = 0, rep = true) {
         seq(
           preprocessor('elif'),
           field('condition', $._preproc_expression),
-          /\n/,
-          rep ? repeat(content($)) : optional(content($)),
+          directiveNewLine($),
+          rep ? repeat(content($)) : required ? content($) : optional(content($)),
           field('alternative', optional(alternativeBlock($)))
         )
       ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-c-sharp",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "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,
@@ -4700,6 +4810,11 @@
       ]
     }
   },
+  {
+    "type": "preproc_arg",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "preproc_define",
     "named": true,
@@ -4801,6 +4916,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true
@@ -4848,6 +4967,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true
@@ -4973,6 +5096,10 @@
           "type": "global_attribute",
           "named": true
         },
+        {
+          "type": "method_signature",
+          "named": true
+        },
         {
           "type": "statement",
           "named": true
@@ -7177,10 +7304,6 @@
     "type": "predefined_type",
     "named": true
   },
-  {
-    "type": "preproc_arg",
-    "named": true
-  },
   {
     "type": "private",
     "named": false

package/tree-sitter.json

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