@willbooster/tree-sitter-c-sharp 1.0.18 → 1.0.20

package/README.md

@@ -27,7 +27,7 @@ The grammar is based upon the Roslyn grammar with changes in order to:
 
 Known gaps:
 
-- `async`, `var` and `await` cannot be used as identifiers everywhere they are valid
+- `var` and `await` cannot be used as identifiers everywhere they are valid
 - A pointer dereference can be assigned to only when its operand is a variable, an address, a parenthesized or
   postfix expression, or a cast of one of these or of an invocation (`*p = 1`, `*(p + 1) = 1`, `*(int*)p = 1`,
   `*dst++ = 1`); `*++p = 1` and `*f() = 1` are not recognized

package/grammar.js

@@ -51,6 +51,7 @@ module.exports = grammar({
     [$._simple_name, $.subpattern],
 
     [$.tuple_element, $.type_pattern],
+    [$.type_pattern, $.declaration_pattern],
     [$.tuple_element, $.using_variable_declarator],
 
     [$.tuple_pattern, $.parameter],
@@ -93,6 +94,13 @@ module.exports = grammar({
     [$.collection_expression, $.list_pattern],
 
     [$._reserved_identifier, $.modifier],
+    [$._reserved_identifier],
+    [$._lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
+    [$._lambda_expression_init, $._reserved_identifier],
+    [$.modifier, $._lambda_expression_init, $.anonymous_method_expression],
+    [$.modifier, $._lambda_expression_init],
+    [$.modifier, $._lambda_expression_init, $._reserved_identifier],
+    [$.modifier, $._lambda_expression_init, $.anonymous_method_expression, $._reserved_identifier],
     [$._reserved_identifier, $.scoped_type],
     [$._reserved_identifier, $.implicit_type],
     [$._reserved_identifier, $.from_clause],
@@ -1511,9 +1519,11 @@ module.exports = grammar({
         -1,
         seq(
           repeat($._attribute_list),
-          repeat(prec(-1, alias(choice('static', 'async'), $.modifier))),
-          optional(field('type', $.type)),
-          field('parameters', $._lambda_parameters)
+          repeat(prec.dynamic(1, alias(choice('static', 'async'), $.modifier))),
+          choice(
+            field('parameters', prec(-1, alias($.identifier, $.implicit_parameter))),
+            seq(optional(field('type', $.type)), field('parameters', $._lambda_parameters))
+          )
         )
       ),
 
@@ -1522,7 +1532,6 @@ module.exports = grammar({
         -1,
         choice(
           $.parameter_list,
-          alias($.identifier, $.implicit_parameter),
           // C# 14: `(ref x) => x`, `(out y) => ...`, `(text, out result) => ...`
           // The opening '(' is recognized via the external _lambda_paren_open
           // token, which the scanner only emits when it can confirm a closing
@@ -1555,7 +1564,7 @@ module.exports = grammar({
 
     anonymous_method_expression: ($) =>
       seq(
-        repeat(prec(-1, alias(choice('static', 'async'), $.modifier))),
+        repeat(prec.dynamic(1, alias(choice('static', 'async'), $.modifier))),
         'delegate',
         optional(field('parameters', $.parameter_list)),
         $.block
@@ -1692,7 +1701,9 @@ module.exports = grammar({
 
     _reserved_identifier: () =>
       choice(
+        prec(-1, '_'),
         'alias',
+        'async',
         'ascending',
         'by',
         'descending',
@@ -1791,7 +1802,7 @@ module.exports = grammar({
         choice(
           'default',
           'hidden',
-          seq($.integer_literal, optional($.string_literal)),
+          seq($.integer_literal, optional(alias($._preproc_filename, $.string_literal))),
           seq(
             '(',
             $.integer_literal,
@@ -1805,18 +1816,36 @@ module.exports = grammar({
             $.integer_literal,
             ')',
             optional($.integer_literal),
-            $.string_literal
+            alias($._preproc_filename, $.string_literal)
           )
         ),
         directiveEnd($)
       ),
 
+    _preproc_filename: ($) =>
+      seq(
+        '"',
+        repeat(
+          choice(
+            alias(token.immediate(prec(1, /[^"\\\r\n\u0085\u2028\u2029]+/)), $.string_literal_content),
+            alias(token.immediate(prec(-1, '\\')), $.string_literal_content),
+            alias(
+              token.immediate(
+                choice(/\\x[0-9a-fA-F]{1,4}/, /\\u[0-9a-fA-F]{4}/, /\\U[0-9a-fA-F]{8}/, /\\[abefnrtv'\\?0]/)
+              ),
+              $.escape_sequence
+            )
+          )
+        ),
+        token.immediate('"')
+      ),
+
     preproc_pragma: ($) =>
       seq(
         preprocessor('pragma'),
         choice(
           seq('warning', choice('disable', 'restore'), commaSep(choice($.identifier, $.integer_literal))),
-          seq('checksum', $.string_literal, $.string_literal, $.string_literal)
+          seq('checksum', alias($._preproc_filename, $.string_literal), $.string_literal, $.string_literal)
         ),
         directiveEnd($)
       ),

package/package.json

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

package/src/node-types.json

@@ -2291,6 +2291,11 @@
       ]
     }
   },
+  {
+    "type": "discard",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "do_statement",
     "named": true,
@@ -6827,6 +6832,10 @@
     "type": "^=",
     "named": false
   },
+  {
+    "type": "_",
+    "named": false
+  },
   {
     "type": "__makeref",
     "named": false
@@ -6944,10 +6953,6 @@
     "type": "disable",
     "named": false
   },
-  {
-    "type": "discard",
-    "named": true
-  },
   {
     "type": "do",
     "named": false

package/tree-sitter.json

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