@willbooster/tree-sitter-c-sharp 14.1.0 → 14.1.2

package/grammar.js

@@ -11,7 +11,7 @@
 const { alias, choice, field, grammar, optional, prec, repeat, repeat1, seq, sym, token } =
   /** @type {typeof globalThis & import('@willbooster/web-tree-sitter/dsl').DSL} */ (globalThis);
 
-/** @typedef {'_preproc_expression' | '_top_level_item_no_statement' | '_namespace_body_item' | '_base_list_mixed_type' | '_base_list_mixed_suffix' | '_base_list_trivia' | '_base_list' | '_base_list_type' | '_base_list_suffix' | '_base_list_prefix' | '_base_list_separator' | '_base_list_separator_path' | '_enum_base_clause' | '_enum_base_type' | 'attribute_list' | 'declaration' | 'enum_member_declaration' | 'expression' | 'method_signature' | 'statement'} PreprocContentRule */
+/** @typedef {'_preproc_expression' | '_top_level_item_no_statement' | '_namespace_body_item' | '_base_list_mixed_type' | '_base_list_mixed_suffix' | '_base_list_trivia' | '_base_list' | '_base_list_type' | '_base_list_suffix' | '_base_list_prefix' | '_base_list_separator' | '_base_list_separator_path' | '_enum_base_clause' | '_enum_base_type' | '_dangling_else_if_statement' | 'attribute_list' | 'declaration' | 'enum_member_declaration' | 'expression' | 'if_statement' | 'method_signature' | 'statement'} PreprocContentRule */
 
 const PREC = {
   GENERIC: 19,
@@ -218,6 +218,7 @@ module.exports = grammar({
     [$.type_pattern, $.declaration_pattern],
     [$.tuple_element, $.using_variable_declarator],
     [$.tuple_pattern, $.parameter],
+    [$.variable_declaration, $.type],
     [$.tuple_pattern, $._simple_name],
     [$.type, $.attribute],
     [$.type, $.nullable_type],
@@ -347,6 +348,7 @@ module.exports = grammar({
     sym('_pragma_text'),
     sym('_expression_generic_end'),
     sym('_definite_expression_generic_end'),
+    sym('_if_alternative_directive'),
   ],
 
   extras: ($) => [
@@ -997,17 +999,29 @@ module.exports = grammar({
     _function_body: ($) =>
       choice(field('body', $.block), seq(field('body', $.arrow_expression_clause), statementEnd()), statementEnd()),
 
-    variable_declaration: ($) => seq(field('type', $.type), commaSep1($.variable_declarator)),
+    variable_declaration: ($) =>
+      choice(
+        seq(field('type', $.type), commaSep1($.variable_declarator)),
+        seq(field('type', $.implicit_type), alias($._deconstruction_declarator, $.variable_declarator))
+      ),
+
+    _deconstruction_declarator: ($) =>
+      prec.dynamic(1, seq(alias($._deconstruction_tuple_pattern, $.tuple_pattern), '=', $.expression)),
+
+    _deconstruction_tuple_pattern: ($) =>
+      seq(
+        '(',
+        commaSep2(
+          choice(field('name', $.identifier), $.discard, alias($._deconstruction_tuple_pattern, $.tuple_pattern))
+        ),
+        ')'
+      ),
 
     using_variable_declaration: ($) =>
       seq(field('type', $.type), commaSep1(alias($.using_variable_declarator, $.variable_declarator))),
 
     variable_declarator: ($) =>
-      seq(
-        choice(field('name', $.identifier), prec.dynamic(-1, $.tuple_pattern)),
-        optional($.bracketed_argument_list),
-        optional(seq('=', $.expression))
-      ),
+      seq(field('name', $.identifier), optional($.bracketed_argument_list), optional(seq('=', $.expression))),
 
     using_variable_declarator: ($) => seq(field('name', $.identifier), optional(seq('=', $.expression))),
 
@@ -1443,15 +1457,23 @@ module.exports = grammar({
     if_statement: ($) =>
       prec.right(
         seq(
-          'if',
-          '(',
-          field('condition', $.expression),
-          ')',
-          field('consequence', $.statement),
+          $._if_statement_head,
+          repeat(seq(sym('_if_alternative_directive'), alias(sym('preproc_if_in_if_alternative'), sym('preproc_if')))),
           optional(seq('else', field('alternative', $.statement)))
         )
       ),
 
+    _if_statement_head: ($) => seq('if', '(', field('condition', $.expression), ')', field('consequence', $.statement)),
+
+    // An `else` directly before a conditional directive takes the statement after the directive as its body, which a
+    // tree cannot attach across the directive boundary.
+    _dangling_else_if_statement: ($) =>
+      seq(
+        $._if_statement_head,
+        'else',
+        optional(field('alternative', alias($._dangling_else_if_statement, $.if_statement)))
+      ),
+
     while_statement: ($) => seq('while', '(', field('condition', $.expression), ')', field('body', $.statement)),
 
     local_declaration_statement: ($) =>
@@ -2686,7 +2708,9 @@ module.exports = grammar({
     ...preprocIf('_in_base_list_separator', ($) => $._base_list_separator_path, 0, false, true),
     ...preprocIf('_in_base_list_suffix', ($) => $._base_list_suffix, 0, false),
     ...preprocIf('', ($) => $.declaration),
-    ...preprocIf('_in_top_level', ($) => choice($._top_level_item_no_statement, $.statement)),
+    ...preprocIf('_in_top_level', ($) => conditionalStatements($), 0, false, true),
+    ...preprocIf('_in_if_alternative', ($) => seq(optional('else'), conditionalStatements($)), 0, false),
+
     ...preprocIf('_in_expression', ($) => $.expression, -2, false),
     ...preprocIf('_in_enum_member_declaration', ($) => $.enum_member_declaration, 0, false),
     ...preprocIf('_in_attribute_list', ($) => $.attribute_list, -1, false),
@@ -3097,6 +3121,18 @@ function preprocIf(suffix, content, precedence = 0, rep = true, required = false
   };
 }
 
+/**
+ * Statements of a conditional branch, where the last may be an if statement whose `else` body follows the directive.
+ *
+ * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<PreprocContentRule>} $
+ */
+function conditionalStatements($) {
+  return seq(
+    repeat(choice($._top_level_item_no_statement, $.statement)),
+    optional(alias($._dangling_else_if_statement, $.if_statement))
+  );
+}
+
 /**
  * @param {'if' | 'elif'} command
  * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<PreprocContentRule>} $

package/package.json

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

package/src/node-types.json

@@ -4122,6 +4122,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "preproc_if",
+          "named": true
+        }
+      ]
     }
   },
   {

package/tree-sitter.json

@@ -19,6 +19,7 @@
       "external-files": [
         "src/genericExpressions.h",
         "src/identifierCharacters.h",
+        "src/ifAlternativeDirective.h",
         "src/nullableRank.h",
         "src/nullableTypes.h",
         "src/questionContext.h",
@@ -30,7 +31,7 @@
     }
   ],
   "metadata": {
-    "version": "14.1.0",
+    "version": "14.1.2",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [