@willbooster/tree-sitter-c-sharp 9.0.0 → 10.0.1

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' | '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' | 'attribute_list' | 'declaration' | 'enum_member_declaration' | 'expression' | 'method_signature' | 'statement'} PreprocContentRule */
 
 const PREC = {
   GENERIC: 19,
@@ -226,11 +226,36 @@ module.exports = grammar({
     [$.parameter, $.declaration_expression],
     [$.parameter, $.tuple_element],
     [$.event_declaration, $.variable_declarator],
-    [$.base_list],
     [$.using_directive, $.modifier],
     [$.using_directive],
     [$._constructor_declaration_initializer, $._simple_name],
     [$.receiver_parameter, $.scoped_type, $._reserved_identifier],
+    [$._base_list_type, $._conditional_base_list_head, $._base_list_prefix],
+    [$._base_list_type, $._base_list_prefix],
+    [$._base_list_separator_path, $._base_list_suffix],
+    [sym('preproc_if_in_base_list'), sym('preproc_if_in_base_list_suffix')],
+    [sym('preproc_elif_in_base_list'), sym('preproc_elif_in_base_list_suffix')],
+    [sym('preproc_else_in_base_list'), sym('preproc_else_in_base_list_suffix')],
+    [sym('preproc_if_in_empty_base'), sym('preproc_if_in_base_list_prefix'), sym('preproc_if_in_base_list_suffix')],
+    [
+      sym('preproc_elif_in_empty_base'),
+      sym('preproc_elif_in_base_list_prefix'),
+      sym('preproc_elif_in_base_list_suffix'),
+    ],
+    [
+      sym('preproc_else_in_empty_base'),
+      sym('preproc_else_in_base_list_prefix'),
+      sym('preproc_else_in_base_list_suffix'),
+    ],
+    [sym('preproc_if_in_empty_base'), sym('preproc_if_in_base_list_prefix')],
+    [sym('preproc_elif_in_empty_base'), sym('preproc_elif_in_base_list_prefix')],
+    [sym('preproc_else_in_empty_base'), sym('preproc_else_in_base_list_prefix')],
+    [sym('preproc_if_in_empty_base'), sym('preproc_if_in_base_list_suffix')],
+    [sym('preproc_elif_in_empty_base'), sym('preproc_elif_in_base_list_suffix')],
+    [sym('preproc_else_in_empty_base'), sym('preproc_else_in_base_list_suffix')],
+    [sym('preproc_if_in_base_list_prefix'), sym('preproc_if_in_base_list_suffix')],
+    [sym('preproc_elif_in_base_list_prefix'), sym('preproc_elif_in_base_list_suffix')],
+    [sym('preproc_else_in_base_list_prefix'), sym('preproc_else_in_base_list_suffix')],
   ],
 
   externals: () => [
@@ -307,6 +332,11 @@ module.exports = grammar({
   ],
 
   inline: ($) => [
+    $._base_list,
+    $._base_list_head,
+    $._base_list_separator,
+    $._enum_base_clause,
+    $._enum_base_type,
     $._postfix_receiver,
     $._namespace_member_declaration,
     $._object_creation_type,
@@ -391,7 +421,20 @@ module.exports = grammar({
     _namespace_member_declaration: ($) => choice($.namespace_declaration, $.type_declaration),
 
     namespace_declaration: ($) =>
-      seq('namespace', field('name', $._name), field('body', $.declaration_list), sym('_optional_semi')),
+      seq(
+        'namespace',
+        field('name', $._name),
+        field('body', alias($._namespace_body, $.declaration_list)),
+        sym('_optional_semi')
+      ),
+
+    _namespace_body: ($) => seq('{', repeat($._namespace_body_item), blockEnd()),
+
+    _namespace_body_item: ($) =>
+      prec(
+        1,
+        choice($.extern_alias_directive, $.declaration, alias(sym('preproc_if_in_namespace'), sym('preproc_if')))
+      ),
 
     file_scoped_namespace_declaration: ($) =>
       prec.right(seq('namespace', field('name', $._name), statementEnd(), repeat($._top_level_item_no_statement))),
@@ -414,7 +457,9 @@ module.exports = grammar({
         repeat($.modifier),
         'class',
         field('name', $.identifier),
-        repeat(choice($.type_parameter_list, $.parameter_list, $.base_list)),
+        optional($.type_parameter_list),
+        optional($.parameter_list),
+        optional($._base_list),
         repeat($.type_parameter_constraints_clause)
       ),
 
@@ -427,7 +472,9 @@ module.exports = grammar({
         optional(seq('ref', optional(alias('partial', $.modifier)))),
         'struct',
         field('name', $.identifier),
-        repeat(choice($.type_parameter_list, $.parameter_list, $.base_list)),
+        optional($.type_parameter_list),
+        optional($.parameter_list),
+        optional($._base_list),
         repeat($.type_parameter_constraints_clause)
       ),
 
@@ -438,7 +485,13 @@ module.exports = grammar({
       ),
 
     _enum_declaration_initializer: ($) =>
-      seq(repeat($._attribute_list), repeat($.modifier), 'enum', field('name', $.identifier), optional($.base_list)),
+      seq(
+        repeat($._attribute_list),
+        repeat($.modifier),
+        'enum',
+        field('name', $.identifier),
+        optional($._enum_base_clause)
+      ),
 
     enum_member_declaration_list: ($) =>
       seq(
@@ -462,7 +515,7 @@ module.exports = grammar({
         'interface',
         field('name', $.identifier),
         field('type_parameters', optional($.type_parameter_list)),
-        optional($.base_list),
+        optional($._base_list),
         repeat($.type_parameter_constraints_clause)
       ),
 
@@ -489,22 +542,15 @@ module.exports = grammar({
         'record',
         optional(choice('class', 'struct')),
         field('name', $.identifier),
-        repeat(choice($.type_parameter_list, $.parameter_list)),
-        optional(alias($.record_base, $.base_list)),
+        optional($.type_parameter_list),
+        optional($.parameter_list),
+        optional($._base_list),
         repeat($.type_parameter_constraints_clause)
       ),
 
-    record_base: ($) =>
-      choice(
-        seq(':', commaSep1($._name)),
-        seq(':', $.primary_constructor_base_type, optional(seq(',', commaSep1($._name))))
-      ),
-
     _declaration_list_body: ($) =>
       choice(seq(field('body', $.declaration_list), sym('_optional_semi')), statementEnd()),
 
-    primary_constructor_base_type: ($) => seq(field('type', $._name), $.argument_list),
-
     modifier: () =>
       prec.right(
         choice(
@@ -537,7 +583,88 @@ module.exports = grammar({
 
     type_parameter: ($) => seq(repeat($._attribute_list), optional(choice('in', 'out')), field('name', $.identifier)),
 
-    base_list: ($) => seq(':', commaSep1(seq($.type, optional($.argument_list)))),
+    _enum_base_clause: ($) => choice(alias($._enum_base_list, $.base_list), $._conditional_enum_base_clause),
+
+    _conditional_enum_base_clause: ($) =>
+      seq(alias(sym('preproc_if_in_enum_base_clause'), sym('preproc_if')), optional($._enum_base_clause)),
+
+    _enum_base_list: ($) => seq(':', $._enum_base_type),
+
+    _enum_base_type: ($) =>
+      seq(
+        repeat($._base_list_trivia),
+        choice(field('underlying_type', $.type), $._conditional_enum_base_type),
+        repeat($._base_list_trivia)
+      ),
+
+    _conditional_enum_base_type: ($) =>
+      choice(
+        alias(sym('preproc_if_in_enum_base_type'), sym('preproc_if')),
+        seq(
+          $._conditional_enum_base_type,
+          repeat($._base_list_trivia),
+          alias(sym('preproc_if_in_enum_base_type'), sym('preproc_if'))
+        )
+      ),
+
+    _base_list_trivia: () => alias(sym('preproc_if_in_empty_base'), sym('preproc_if')),
+
+    _base_list: ($) => choice($.base_list, $._conditional_base_list),
+
+    _conditional_base_list: ($) =>
+      seq(
+        alias(sym('preproc_if_in_base_list'), sym('preproc_if')),
+        optional(choice($._base_list_suffix, $._base_list))
+      ),
+
+    base_list: ($) => seq(':', $._base_list_type),
+
+    _base_list_type: ($) =>
+      choice(
+        seq($._base_list_mixed_type, choice($._base_list_type, $._base_list_suffix)),
+        seq(alias(sym('preproc_if_in_base_list_prefix'), sym('preproc_if')), $._base_list_type),
+        seq($._base_list_head, optional($._base_list_suffix))
+      ),
+
+    _base_list_head: ($) =>
+      choice(seq(field('base', $.type), optional($.argument_list)), $._conditional_base_list_head),
+
+    _conditional_base_list_head: ($) =>
+      choice(
+        alias(sym('preproc_if_in_base_list_type'), sym('preproc_if')),
+        seq(
+          $._conditional_base_list_head,
+          repeat($._base_list_trivia),
+          alias(sym('preproc_if_in_base_list_type'), sym('preproc_if'))
+        )
+      ),
+
+    _base_list_mixed_type: () => alias(sym('preproc_if_in_mixed_base_type'), sym('preproc_if')),
+
+    _base_list_mixed_suffix: () => alias(sym('preproc_if_in_mixed_base_suffix'), sym('preproc_if')),
+
+    _base_list_prefix: ($) =>
+      choice(
+        seq($._base_list_mixed_type, choice($._base_list_prefix, $._base_list_separator_path)),
+        seq(alias(sym('preproc_if_in_base_list_prefix'), sym('preproc_if')), optional($._base_list_prefix)),
+        seq($._base_list_head, $._base_list_separator_path)
+      ),
+
+    _base_list_separator: () => choice(',', alias(sym('preproc_if_in_base_list_separator'), sym('preproc_if'))),
+
+    _base_list_separator_path: ($) =>
+      choice(
+        seq($._base_list_mixed_suffix, choice($._base_list_prefix, $._base_list_separator_path)),
+        seq(alias(sym('preproc_if_in_base_list_suffix'), sym('preproc_if')), $._base_list_separator_path),
+        seq($._base_list_separator, optional($._base_list_prefix))
+      ),
+
+    _base_list_suffix: ($) =>
+      choice(
+        seq($._base_list_mixed_suffix, choice($._base_list_type, $._base_list_suffix)),
+        seq(alias(sym('preproc_if_in_base_list_suffix'), sym('preproc_if')), optional($._base_list_suffix)),
+        seq($._base_list_separator, $._base_list_type)
+      ),
 
     type_parameter_constraints_clause: ($) => seq('where', $.identifier, ':', commaSep1($.type_parameter_constraint)),
 
@@ -2336,6 +2463,37 @@ module.exports = grammar({
       false,
       true
     ),
+    ...preprocIf('_in_namespace', ($) => $._namespace_body_item, 1),
+    ...preprocIfWithMixedContent(
+      '_in_mixed_base_type',
+      ($) => $._base_list_type,
+      ($) => $._base_list_prefix,
+      ($) =>
+        choice(
+          $._base_list_mixed_type,
+          seq($._base_list_prefix, $._base_list_mixed_type),
+          seq($._base_list_type, $._base_list_mixed_suffix)
+        )
+    ),
+    ...preprocIfWithMixedContent(
+      '_in_mixed_base_suffix',
+      ($) => $._base_list_suffix,
+      ($) => $._base_list_separator_path,
+      ($) =>
+        choice(
+          $._base_list_mixed_suffix,
+          seq($._base_list_suffix, $._base_list_mixed_suffix),
+          seq($._base_list_separator_path, $._base_list_mixed_type)
+        )
+    ),
+    ...preprocIf('_in_empty_base', ($) => $._base_list_trivia),
+    ...preprocIf('_in_enum_base_clause', ($) => $._enum_base_clause, 0, false),
+    ...preprocIfWithContent('_in_enum_base_type', ($) => $._enum_base_type),
+    ...preprocIf('_in_base_list', ($) => $._base_list, 0, false),
+    ...preprocIfWithContent('_in_base_list_type', ($) => $._base_list_type),
+    ...preprocIf('_in_base_list_prefix', ($) => $._base_list_prefix, 0, false),
+    ...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_expression', ($) => $.expression, -2, false),
@@ -2612,6 +2770,87 @@ function preprocessor(command) {
   return alias(new RegExp('#[ \t]*' + command), '#' + command);
 }
 
+/**
+ * @param {string} suffix
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>} complete
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>} prefix
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>} mixed
+ * @returns {Record<string, import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>>}
+ */
+function preprocIfWithMixedContent(suffix, complete, prefix, mixed) {
+  const contents = [undefined, complete, prefix, mixed];
+  /** @param {number} mask */
+  function alternativeBlock(mask) {
+    return choice(
+      alias(sym('preproc_else' + suffix + mask), sym('preproc_else')),
+      alias(sym('preproc_elif' + suffix + mask), sym('preproc_elif'))
+    );
+  }
+  /**
+   * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<PreprocContentRule>} $
+   * @param {number} mask
+   */
+  function contentOrAlternative($, mask) {
+    return choice(
+      ...contents.map((content, provided) => {
+        const remaining = mask & ~provided;
+        const alternative = field(
+          'alternative',
+          remaining ? alternativeBlock(remaining) : optional(alternativeBlock(0))
+        );
+        return content ? seq(content($), alternative) : alternative;
+      })
+    );
+  }
+  /** @type {Record<string, import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>>} */
+  const rules = {
+    ['preproc_if' + suffix]: ($) => conditionalDirective('if', $, contentOrAlternative($, 3), preprocessor('endif')),
+  };
+  for (const mask of [0, 1, 2, 3]) {
+    rules['preproc_elif' + suffix + mask] = ($) => conditionalDirective('elif', $, contentOrAlternative($, mask));
+    rules['preproc_else' + suffix + mask] = ($) =>
+      seq(
+        preprocessor('else'),
+        choice(
+          ...contents.flatMap((content, provided) => (content && (provided & mask) === mask ? [content($)] : [])),
+          ...(mask === 0 ? [optional($._base_list_trivia)] : [])
+        )
+      );
+  }
+  return rules;
+}
+
+/**
+ * @param {string} suffix
+ * @param {import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>} content
+ * @returns {Record<string, import('@willbooster/web-tree-sitter/dsl').RuleBuilder<PreprocContentRule>>}
+ */
+function preprocIfWithContent(suffix, content) {
+  /** @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<PreprocContentRule>} $ */
+  function contentOrAlternative($) {
+    return choice(
+      seq(content($), field('alternative', optional(alternativeBlock(false)))),
+      seq(repeat($._base_list_trivia), field('alternative', alternativeBlock(true)))
+    );
+  }
+
+  /** @param {boolean} required */
+  function alternativeBlock(required) {
+    const alternativeSuffix = suffix + (required ? '_with_content' : '');
+    return choice(
+      alias(sym('preproc_else' + alternativeSuffix), sym('preproc_else')),
+      alias(sym('preproc_elif' + alternativeSuffix), sym('preproc_elif'))
+    );
+  }
+
+  return {
+    ...preprocIf(suffix, ($) => choice(content($), repeat1($._base_list_trivia)), 0, false),
+    ['preproc_if' + suffix]: ($) => conditionalDirective('if', $, contentOrAlternative($), preprocessor('endif')),
+    ['preproc_else' + suffix + '_with_content']: ($) => seq(preprocessor('else'), content($)),
+    ['preproc_elif' + suffix + '_with_content']: ($) => conditionalDirective('elif', $, contentOrAlternative($)),
+  };
+}
+
 /**
  *
  * @param {string} suffix
@@ -2648,10 +2887,9 @@ function preprocIf(suffix, content, precedence = 0, rep = true, required = false
     ['preproc_if' + suffix]: ($) =>
       prec(
         precedence,
-        seq(
-          preprocessor('if'),
-          field('condition', $._preproc_expression),
-          directiveNewLine(),
+        conditionalDirective(
+          'if',
+          $,
           contentRule($),
           field('alternative', optional(alternativeBlock())),
           preprocessor('endif')
@@ -2663,17 +2901,20 @@ function preprocIf(suffix, content, precedence = 0, rep = true, required = false
     ['preproc_elif' + suffix]: ($) =>
       prec(
         precedence,
-        seq(
-          preprocessor('elif'),
-          field('condition', $._preproc_expression),
-          directiveNewLine(),
-          contentRule($),
-          field('alternative', optional(alternativeBlock()))
-        )
+        conditionalDirective('elif', $, contentRule($), field('alternative', optional(alternativeBlock())))
       ),
   };
 }
 
+/**
+ * @param {'if' | 'elif'} command
+ * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<PreprocContentRule>} $
+ * @param {...import('@willbooster/web-tree-sitter/dsl').RuleOrLiteral} content
+ */
+function conditionalDirective(command, $, ...content) {
+  return seq(preprocessor(command), field('condition', $._preproc_expression), directiveNewLine(), ...content);
+}
+
 /**
  * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'_simple_name'>} $
  * @param {import('@willbooster/web-tree-sitter/dsl').Rule} receiver

package/package.json

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

package/queries/highlights.scm

@@ -11,8 +11,8 @@
 (interface_declaration name: (identifier) @type)
 (class_declaration name: (identifier) @type)
 (enum_declaration name: (identifier) @type)
-(struct_declaration (identifier) @type)
-(record_declaration (identifier) @type)
+(struct_declaration name: (identifier) @type)
+(record_declaration name: (identifier) @type)
 (namespace_declaration name: (identifier) @module)
 
 (generic_name (identifier) @type)
@@ -27,8 +27,6 @@
 
 (_ type: (identifier) @type)
 
-(base_list (identifier) @type)
-
 (predefined_type) @type.builtin
 
 ;; Enum
@@ -219,3 +217,7 @@
 (file_directive_value) @string
 
 (file_directive_kind) @keyword.directive
+
+(_ base: (identifier) @type)
+
+(_ underlying_type: (identifier) @type)

package/queries/tags.scm

@@ -1,11 +1,9 @@
 (class_declaration name: (identifier) @name) @definition.class
 
-(class_declaration (base_list (_) @name)) @reference.class
+(_ base: (_) @name @reference.class)
 
 (interface_declaration name: (identifier) @name) @definition.interface
 
-(interface_declaration (base_list (_) @name)) @reference.interface
-
 (method_declaration name: (identifier) @name) @definition.method
 
 (method_signature name: (identifier) @name) @definition.method

package/src/node-types.json

@@ -1427,21 +1427,38 @@
   {
     "type": "base_list",
     "named": true,
-    "fields": {},
+    "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
+      "underlying_type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "argument_list",
           "named": true
         },
         {
-          "type": "primary_constructor_base_type",
-          "named": true
-        },
-        {
-          "type": "type",
+          "type": "preproc_if",
           "named": true
         }
       ]
@@ -1952,6 +1969,16 @@
     "type": "class_declaration",
     "named": true,
     "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "body": {
         "multiple": false,
         "required": false,
@@ -1977,6 +2004,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
@@ -1993,6 +2024,10 @@
           "type": "parameter_list",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
         {
           "type": "preproc_if_in_attribute_list",
           "named": true
@@ -2663,6 +2698,10 @@
         {
           "type": "declaration",
           "named": true
+        },
+        {
+          "type": "extern_alias_directive",
+          "named": true
         }
       ]
     }
@@ -3123,6 +3162,10 @@
           "type": "modifier",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
         {
           "type": "preproc_if_in_attribute_list",
           "named": true
@@ -4199,6 +4242,16 @@
     "type": "interface_declaration",
     "named": true,
     "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "body": {
         "multiple": false,
         "required": false,
@@ -4234,6 +4287,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
@@ -4246,6 +4303,10 @@
           "type": "modifier",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
         {
           "type": "preproc_if_in_attribute_list",
           "named": true
@@ -6138,6 +6199,16 @@
           }
         ]
       },
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -6171,16 +6242,34 @@
             "named": true
           }
         ]
+      },
+      "underlying_type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
       }
     },
     "children": {
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
         },
+        {
+          "type": "base_list",
+          "named": true
+        },
         {
           "type": "declaration",
           "named": true
@@ -6223,15 +6312,44 @@
   {
     "type": "preproc_else",
     "named": true,
-    "fields": {},
+    "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
+      "underlying_type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
         },
+        {
+          "type": "base_list",
+          "named": true
+        },
         {
           "type": "declaration",
           "named": true
@@ -6322,6 +6440,16 @@
           }
         ]
       },
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -6355,12 +6483,30 @@
             "named": true
           }
         ]
+      },
+      "underlying_type": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
       }
     },
     "children": {
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
+        {
+          "type": "base_list",
+          "named": true
+        },
         {
           "type": "declaration",
           "named": true
@@ -6567,44 +6713,6 @@
       ]
     }
   },
-  {
-    "type": "primary_constructor_base_type",
-    "named": true,
-    "fields": {
-      "type": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "alias_qualified_name",
-            "named": true
-          },
-          {
-            "type": "generic_name",
-            "named": true
-          },
-          {
-            "type": "identifier",
-            "named": true
-          },
-          {
-            "type": "qualified_name",
-            "named": true
-          }
-        ]
-      }
-    },
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "argument_list",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "property_declaration",
     "named": true,
@@ -6863,6 +6971,16 @@
     "type": "record_declaration",
     "named": true,
     "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "body": {
         "multiple": false,
         "required": false,
@@ -6888,6 +7006,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
@@ -6904,6 +7026,10 @@
           "type": "parameter_list",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
         {
           "type": "preproc_if_in_attribute_list",
           "named": true
@@ -7255,6 +7381,16 @@
     "type": "struct_declaration",
     "named": true,
     "fields": {
+      "base": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      },
       "body": {
         "multiple": false,
         "required": false,
@@ -7280,6 +7416,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "argument_list",
+          "named": true
+        },
         {
           "type": "attribute_list",
           "named": true
@@ -7296,6 +7436,10 @@
           "type": "parameter_list",
           "named": true
         },
+        {
+          "type": "preproc_if",
+          "named": true
+        },
         {
           "type": "preproc_if_in_attribute_list",
           "named": true

package/tree-sitter.json

@@ -29,7 +29,7 @@
     }
   ],
   "metadata": {
-    "version": "9.0.0",
+    "version": "10.0.1",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [