@willbooster/tree-sitter-c-sharp 11.0.0 → 13.0.0

package/grammar.js

@@ -53,6 +53,48 @@ module.exports = grammar({
   name: 'c_sharp',
 
   conflicts: ($) => [
+    [$._simple_name, $._expression_simple_name, $._pattern_simple_identifier_name, $._ambiguous_cast_qualified_name],
+    [$._expression_simple_name, $._ambiguous_cast_qualified_name],
+    [$._simple_name, $._expression_simple_name, $._ambiguous_cast_qualified_name],
+    [$.parameter, $._expression_simple_name, $._ambiguous_cast_name],
+    [$.parameter, $._simple_name, $._expression_simple_name, $._ambiguous_cast_name],
+    [$._expression_simple_name, $._ambiguous_cast_name],
+    [$._simple_name, $._expression_simple_name, $._ambiguous_cast_name],
+    [$._simple_name, $.generic_name, $._expression_generic_name, $._pattern_simple_identifier_name],
+    [$._expression_simple_name, $.generic_name, $._expression_generic_name, $._pattern_simple_identifier_name],
+    [
+      $._simple_name,
+      $._expression_simple_name,
+      $.generic_name,
+      $._expression_generic_name,
+      $._pattern_simple_identifier_name,
+    ],
+    [$._expression_simple_name, $._pattern_simple_identifier_name],
+    [$._simple_name, $._expression_simple_name, $._pattern_simple_identifier_name],
+    [$.generic_name, $._expression_generic_name, $._pattern_simple_identifier_name],
+    [$._simple_name, $.generic_name, $._expression_generic_name],
+    [$._expression_simple_name, $._expression_generic_name],
+    [$._simple_name, $._expression_simple_name, $.generic_name, $._expression_generic_name],
+    [$._expression_simple_name, $.subpattern],
+    [$._expression_simple_name, $.parameter],
+    [$._simple_name, $._expression_simple_name, $.parameter],
+
+    [$.type_argument_list, $._expression_type_argument_list],
+    [$._definite_expression_argument_type, $.type],
+    [$._definite_expression_pointer_type, $._pointer_base_type],
+    [$._name, $._nongeneric_expression_argument_type],
+    [$._name, $._other_expression_pointer_type],
+    [$._nongeneric_expression_argument_type, $.type],
+    [$._other_expression_pointer_type, $._pointer_base_type],
+    [$._simple_name, $._nongeneric_expression_argument_type],
+    [$._simple_name, $._nongeneric_expression_qualified_name],
+    [$._simple_name, $._other_expression_pointer_type],
+    [$.type_argument_list, $._method_expression_arguments],
+    [$._ambiguous_expression_arguments, $._method_expression_arguments],
+    [$._primary_no_conditional_access_expression, $._range_cast_type, $._definite_cast_name],
+    [$._name, $._primary_no_conditional_access_expression, $._range_cast_type, $._definite_cast_name],
+    [$._simple_name, $._expression_simple_name],
+    [$.generic_name, $._expression_simple_name, $._expression_generic_name],
     [$.list_pattern],
     [$._conditional_binding_receiver, $._binding_generic_suppression_expression],
     [$._member_conditional_binding_receiver, $._member_binding_generic_suppression_expression],
@@ -90,20 +132,14 @@ module.exports = grammar({
     [$._definite_cast_type, $._range_cast_type],
     [$.type, $._definite_cast_type, $._range_cast_type],
     [$._pattern_type, $._definite_cast_type, $._range_cast_type],
-    [$._definite_cast_name, $._range_cast_type],
-    [$._name, $._definite_cast_name, $._range_cast_type],
     [$.array_rank_specifier, $._omitted_array_rank_specifier],
     [$._pattern_parenthesized_expression, $.constant_pattern, $.expression],
     [$._pattern_parenthesized_expression, $.constant_pattern],
-    [$._simple_name, $._pattern_simple_identifier_name, $._ambiguous_cast_qualified_name],
-    [$._simple_name, $._ambiguous_cast_qualified_name],
     [$._simple_name, $._definite_cast_qualified_name],
     [$.positional_pattern_clause, $._untyped_positional_pattern_clause],
     [$._parenthesized_pattern_with_designation, $.subpattern],
     [$._pattern_type, $._definite_cast_type],
     [$.type, $._definite_cast_type],
-    [$.parameter, $._simple_name, $._ambiguous_cast_name],
-    [$._simple_name, $._ambiguous_cast_name],
     [$._simple_name, $._definite_cast_name],
     [$._name, $._definite_cast_name],
     [$._object_initializer_expression, $.initializer_expression],
@@ -132,10 +168,7 @@ module.exports = grammar({
     [$._pattern_type, $._pointer_base_type],
     [$._pattern_member_access_expression, $._pattern_generic_member_expression],
     [$._simple_name, $._pattern_simple_generic_name],
-    [$._simple_name, $.generic_name, $._pattern_simple_identifier_name],
     [$._simple_name, $._pattern_simple_identifier_name],
-    [$.generic_name, $._pattern_simple_identifier_name],
-    [$._pattern_non_name_member_access_expression, $.member_access_expression],
     [$._pattern_unary_expression, $._unary_expression],
     [$._pattern_primary_expression, $._primary_expression],
     [$._pattern_primary_expression, $._primary_no_conditional_access_expression],
@@ -181,7 +214,6 @@ module.exports = grammar({
     [$.modifier, $._constructor_declaration_initializer, $._reserved_identifier],
     [$._simple_name, $.generic_name],
     [$._simple_name, $.type_parameter],
-    [$._simple_name, $.subpattern],
     [$.tuple_element, $.type_pattern],
     [$.type_pattern, $.declaration_pattern],
     [$.tuple_element, $.using_variable_declarator],
@@ -194,7 +226,6 @@ module.exports = grammar({
     [$.type, $._array_base_type, $.array_creation_expression],
     [$.type, $.array_creation_expression],
     [$.type, $._pointer_base_type],
-    [$.qualified_name, $.member_access_expression],
     [$.qualified_name, $.explicit_interface_specifier],
     [$._array_base_type, $.stackalloc_expression],
     [$.constant_pattern, $._expression_statement_expression],
@@ -314,6 +345,8 @@ module.exports = grammar({
     sym('_interpolation_format_colon'),
     sym('_pragma_boundary'),
     sym('_pragma_text'),
+    sym('_expression_generic_end'),
+    sym('_definite_expression_generic_end'),
   ],
 
   extras: ($) => [
@@ -347,6 +380,7 @@ module.exports = grammar({
 
   precedences: ($) => [
     [$._anonymous_object_member_declarator, $._simple_name],
+    [$._anonymous_object_member_declarator, $._expression_simple_name],
     [$.block, $.initializer_expression],
   ],
 
@@ -361,6 +395,11 @@ module.exports = grammar({
     $._ambiguous_cast_type,
     $._definite_cast_type,
     $._range_cast_type,
+    $._definite_expression_type_argument,
+    $._ambiguous_expression_type_argument,
+    $._other_expression_type_argument,
+    $._nongeneric_expression_type_argument,
+    $._method_expression_type_argument,
     $._is_pattern,
     $._nonconstant_pattern,
   ],
@@ -579,7 +618,12 @@ module.exports = grammar({
         )
       ),
 
-    type_parameter_list: ($) => seq('<', commaSep1($.type_parameter), '>'),
+    type_parameter_list: ($) =>
+      seq(
+        '<',
+        commaSep1($.type_parameter),
+        choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
+      ),
 
     type_parameter: ($) => seq(repeat($._attribute_list), optional(choice('in', 'out')), field('name', $.identifier)),
 
@@ -980,7 +1024,149 @@ module.exports = grammar({
 
     generic_name: ($) => prec.dynamic(1, seq($.identifier, $.type_argument_list)),
 
-    type_argument_list: ($) => seq('<', choice(repeat(','), commaSep1($.type)), '>'),
+    type_argument_list: ($) =>
+      seq(
+        '<',
+        choice(repeat(','), commaSep1($.type)),
+        choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
+      ),
+
+    _expression_simple_name: ($) => choice($.identifier, alias($._expression_generic_name, $.generic_name)),
+
+    _expression_generic_name: ($) =>
+      prec.dynamic(1, seq($.identifier, alias($._expression_type_argument_list, $.type_argument_list))),
+
+    _expression_type_argument_list: ($) =>
+      seq(
+        '<',
+        choice(
+          seq(choice(repeat(','), commaSep1($.type)), alias(sym('_expression_generic_end'), '>')),
+          seq(repeat(','), alias(sym('_definite_expression_generic_end'), '>')),
+          seq(
+            repeat(seq(alias($._other_expression_type_argument, $.type), ',')),
+            choice(
+              alias($._definite_expression_type_argument, $.type),
+              seq(alias($._ambiguous_expression_type_argument, $.type), ',', $.type)
+            ),
+            repeat(seq(',', $.type)),
+            alias(sym('_definite_expression_generic_end'), '>')
+          )
+        )
+      ),
+
+    _definite_expression_type_argument: ($) => $._definite_expression_argument_type,
+
+    _ambiguous_expression_type_argument: ($) => $._ambiguous_expression_argument_type,
+
+    _other_expression_type_argument: ($) => $._other_expression_argument_type,
+
+    _nongeneric_expression_type_argument: ($) => $._nongeneric_expression_argument_type,
+
+    _method_expression_type_argument: ($) => $._method_expression_argument_type,
+
+    _definite_expression_argument_type: ($) =>
+      choice(
+        $.predefined_type,
+        $.nullable_type,
+        $.function_pointer_type,
+        alias($._omitted_cast_array_type, $.array_type),
+        alias($._definite_expression_pointer_type, $.pointer_type)
+      ),
+
+    _definite_expression_pointer_type: ($) =>
+      seq(
+        field(
+          'type',
+          choice(
+            $.predefined_type,
+            $.nullable_type,
+            $.function_pointer_type,
+            alias($._definite_expression_pointer_type, $.pointer_type),
+            alias($._method_expression_generic_name, $.generic_name),
+            alias($._method_expression_qualified_name, $.qualified_name)
+          )
+        ),
+        '*'
+      ),
+
+    _ambiguous_expression_argument_type: ($) =>
+      choice(
+        alias($._ambiguous_expression_generic_name, $.generic_name),
+        alias($._ambiguous_expression_qualified_name, $.qualified_name)
+      ),
+
+    _ambiguous_expression_generic_name: ($) =>
+      prec.dynamic(1, seq($.identifier, alias($._ambiguous_expression_arguments, $.type_argument_list))),
+
+    _ambiguous_expression_arguments: ($) =>
+      seq(
+        '<',
+        commaSep1(alias($._nongeneric_expression_type_argument, $.type)),
+        choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
+      ),
+
+    _ambiguous_expression_qualified_name: ($) =>
+      seq(field('qualifier', $._name), '.', field('name', alias($._ambiguous_expression_generic_name, $.generic_name))),
+
+    _other_expression_argument_type: ($) =>
+      choice($._nongeneric_expression_argument_type, $._method_expression_argument_type),
+
+    _nongeneric_expression_argument_type: ($) =>
+      choice(
+        $.identifier,
+        alias($._nongeneric_expression_qualified_name, $.qualified_name),
+        $.alias_qualified_name,
+        $.tuple_type,
+        alias($._other_expression_pointer_type, $.pointer_type)
+      ),
+
+    _method_expression_argument_type: ($) =>
+      choice(
+        alias($._method_expression_generic_name, $.generic_name),
+        alias($._method_expression_qualified_name, $.qualified_name)
+      ),
+
+    _nongeneric_expression_qualified_name: ($) => seq(field('qualifier', $._name), '.', field('name', $.identifier)),
+
+    _method_expression_generic_name: ($) =>
+      prec.dynamic(1, seq($.identifier, alias($._method_expression_arguments, $.type_argument_list))),
+
+    _method_expression_arguments: ($) =>
+      seq(
+        '<',
+        choice(
+          repeat(','),
+          seq(
+            repeat(seq(alias($._nongeneric_expression_type_argument, $.type), ',')),
+            choice(
+              alias($._definite_expression_type_argument, $.type),
+              alias($._ambiguous_expression_type_argument, $.type),
+              alias($._method_expression_type_argument, $.type)
+            ),
+            repeat(seq(',', $.type))
+          )
+        ),
+        choice('>', alias(sym('_expression_generic_end'), '>'), alias(sym('_definite_expression_generic_end'), '>'))
+      ),
+
+    _method_expression_qualified_name: ($) =>
+      seq(field('qualifier', $._name), '.', field('name', alias($._method_expression_generic_name, $.generic_name))),
+
+    _other_expression_pointer_type: ($) =>
+      seq(
+        field(
+          'type',
+          choice(
+            $.identifier,
+            alias($._nongeneric_expression_qualified_name, $.qualified_name),
+            $.alias_qualified_name,
+            $.tuple_type,
+            $._ambiguous_expression_argument_type,
+            alias($._other_expression_pointer_type, $.pointer_type)
+          )
+        ),
+        '*'
+      ),
 
     type: ($) => typeAlternatives($),
 
@@ -1688,11 +1874,15 @@ module.exports = grammar({
       ),
 
     _primary_no_conditional_access_expression: ($) =>
-      primaryAtoms($, { name: $._simple_name, member: $.member_access_expression, collection: true }),
+      primaryAtoms($, {
+        name: choice($._expression_simple_name, $.alias_qualified_name),
+        member: $.member_access_expression,
+        collection: true,
+      }),
 
     _conditional_access_receiver: ($) =>
       primaryAtoms($, {
-        name: $._simple_name,
+        name: choice($._expression_simple_name, $.alias_qualified_name),
         member: $.member_access_expression,
         collection: true,
         element: $.element_access_expression,
@@ -1705,7 +1895,7 @@ module.exports = grammar({
 
     _definite_conditional_access_receiver: ($) =>
       primaryAtoms($, {
-        name: $._simple_name,
+        name: choice($._expression_simple_name, $.alias_qualified_name),
         member: $.member_access_expression,
         collection: true,
         element: $.element_access_expression,
@@ -2206,7 +2396,7 @@ module.exports = grammar({
 
     member_access_expression: ($) => memberAccessExpression($, choice($._postfix_receiver, $.predefined_type, $._name)),
 
-    member_binding_expression: ($) => seq('.', field('name', $._simple_name)),
+    member_binding_expression: ($) => seq('.', field('name', $._expression_simple_name)),
 
     object_creation_expression: ($) =>
       prec.right(
@@ -2916,13 +3106,13 @@ function conditionalDirective(command, $, ...content) {
 }
 
 /**
- * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'_simple_name'>} $
+ * @param {import('@willbooster/web-tree-sitter/dsl').GrammarSymbols<'_expression_simple_name'>} $
  * @param {import('@willbooster/web-tree-sitter/dsl').Rule} receiver
  * @param {import('@willbooster/web-tree-sitter/dsl').Rule} [name]
  * @param {import('@willbooster/web-tree-sitter/dsl').RuleOrLiteral} [operator]
  * @returns {import('@willbooster/web-tree-sitter/dsl').Rule}
  */
-function memberAccessExpression($, receiver, name = $._simple_name, operator = choice('.', '->')) {
+function memberAccessExpression($, receiver, name = $._expression_simple_name, operator = choice('.', '->')) {
   return prec(PREC.DOT, seq(field('expression', receiver), operator, field('name', name)));
 }
 

package/package.json

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

package/queries/highlights.scm

@@ -2,8 +2,8 @@
 
 ;; Methods
 
-(method_declaration name: (identifier) @function)
-(method_signature name: (identifier) @function)
+(method_declaration name: (identifier) @function.method)
+(method_signature name: (identifier) @function.method)
 (local_function_statement name: (identifier) @function)
 
 ;; Types
@@ -208,9 +208,38 @@
 
 (type_parameter_constraints_clause (identifier) @property.definition)
 
-;; Method calls
+;; Members
 
-(invocation_expression (member_access_expression name: (identifier) @function))
+[
+  (field_declaration (variable_declaration (variable_declarator name: (identifier) @variable.member)))
+  (event_field_declaration (variable_declaration (variable_declarator name: (identifier) @variable.member)))
+  (property_declaration name: (identifier) @variable.member)
+  (event_declaration name: (identifier) @variable.member)
+  (object_creation_expression
+    initializer: (initializer_expression (assignment_expression left: (identifier) @variable.member)))
+  (implicit_object_creation_expression
+    (initializer_expression (assignment_expression left: (identifier) @variable.member)))
+  (assignment_expression
+    right: (initializer_expression (assignment_expression left: (identifier) @variable.member)))
+  (anonymous_object_creation_expression (identifier) @variable.member . "=")
+  (with_initializer . (identifier) @variable.member)
+  (member_access_expression name: (identifier) @variable.member)
+  (member_access_expression name: (generic_name (identifier) @variable.member))
+  (member_binding_expression name: (identifier) @variable.member)
+  (member_binding_expression name: (generic_name (identifier) @variable.member))
+]
+
+;; Calls
+
+(invocation_expression
+  function: [
+    (identifier) @function.call
+    (generic_name (identifier) @function.call)
+    (member_access_expression name: (identifier) @function.method.call)
+    (member_access_expression name: (generic_name (identifier) @function.method.call))
+    (member_binding_expression name: (identifier) @function.method.call)
+    (member_binding_expression name: (generic_name (identifier) @function.method.call))
+  ])
 
 ["#:sdk" "#:package" "#:property" "#:project" "#:ref" "#:include" "#:exclude"] @keyword.directive
 (file_directive_name) @property

package/src/node-types.json

@@ -93,6 +93,10 @@
     "type": "expression",
     "named": true,
     "subtypes": [
+      {
+        "type": "alias_qualified_name",
+        "named": true
+      },
       {
         "type": "anonymous_method_expression",
         "named": true
@@ -970,6 +974,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "alias_qualified_name",
+            "named": true
+          },
           {
             "type": "anonymous_method_expression",
             "named": true
@@ -1289,6 +1297,10 @@
       "multiple": false,
       "required": false,
       "types": [
+        {
+          "type": "alias_qualified_name",
+          "named": true
+        },
         {
           "type": "anonymous_method_expression",
           "named": true
@@ -1701,6 +1713,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "alias_qualified_name",
+            "named": true
+          },
           {
             "type": "anonymous_method_expression",
             "named": true
@@ -2133,6 +2149,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "alias_qualified_name",
+            "named": true
+          },
           {
             "type": "anonymous_method_expression",
             "named": true
@@ -2959,6 +2979,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "alias_qualified_name",
+            "named": true
+          },
           {
             "type": "anonymous_method_expression",
             "named": true
@@ -3367,6 +3391,10 @@
       "multiple": false,
       "required": false,
       "types": [
+        {
+          "type": "alias_qualified_name",
+          "named": true
+        },
         {
           "type": "anonymous_method_expression",
           "named": true
@@ -5894,6 +5922,10 @@
       "multiple": false,
       "required": false,
       "types": [
+        {
+          "type": "alias_qualified_name",
+          "named": true
+        },
         {
           "type": "anonymous_method_expression",
           "named": true
@@ -6025,6 +6057,10 @@
       "multiple": false,
       "required": false,
       "types": [
+        {
+          "type": "alias_qualified_name",
+          "named": true
+        },
         {
           "type": "anonymous_method_expression",
           "named": true

package/tree-sitter.json

@@ -17,6 +17,7 @@
       ],
       "injection-regex": "cs",
       "external-files": [
+        "src/genericExpressions.h",
         "src/identifierCharacters.h",
         "src/nullableRank.h",
         "src/nullableTypes.h",
@@ -29,7 +30,7 @@
     }
   ],
   "metadata": {
-    "version": "11.0.0",
+    "version": "13.0.0",
     "license": "MIT",
     "description": "C# grammar for tree-sitter",
     "authors": [