Merge pull request #224 from tree-sitter/csharp-11-features

C# 11 features

Author: hendrikvanantwerpen

README.md

@@ -55,7 +55,9 @@ Comprehensive supports C# 1 through 10.0 with the following exceptions:
 - [x] Generic attributes
 - [x] Static abstract members in interfaces
 - [x] Newlines in string interpolations
-- [ ] List patterns
+- [x] List patterns
+- [x] Slice pattern
+- [x] Required members
 - [ ] Raw string literals
 
 ### References

corpus/expressions.txt

@@ -1877,9 +1877,9 @@ var x = c is < '0' or >= 'A' and <= 'Z';
           (equals_value_clause
             (is_pattern_expression
               (identifier)
-              (binary_pattern
+              (or_pattern
                 (relational_pattern (character_literal))
-                (binary_pattern
+                (and_pattern
                   (relational_pattern (character_literal))
                   (relational_pattern (character_literal)))))))))))
 
@@ -2019,7 +2019,7 @@ var c = o is int; //is_expression with type
           (equals_value_clause
             (is_pattern_expression
               (identifier)
-              (binary_pattern
+              (or_pattern
                 (type_pattern (predefined_type))
                 (type_pattern (predefined_type))))))))) (comment)
   (global_statement
@@ -2033,6 +2033,31 @@ var c = o is int; //is_expression with type
                 (identifier)
                 (predefined_type))))))) (comment))
 
+=====================================
+List patterns
+=====================================
+
+var a = p is [1,2,x,] and [] or [2,..];
+
+---
+
+(compilation_unit
+  (global_statement
+    (local_declaration_statement
+      (variable_declaration (implicit_type)
+        (variable_declarator (identifier)
+          (equals_value_clause
+            (is_pattern_expression (identifier)
+              (or_pattern
+                (and_pattern
+                  (list_pattern
+                    (constant_pattern (integer_literal))
+                    (constant_pattern (integer_literal))
+                    (constant_pattern (identifier)))
+                  (list_pattern))
+                  (list_pattern
+                    (constant_pattern (integer_literal))
+                    (slice_pattern))))))))))
 
 =====================================
 Conditional expression with member accesses

corpus/literals.txt

@@ -314,6 +314,50 @@ class A {
           (identifier)
           (equals_value_clause (string_literal (escape_sequence)))))))))
 
+=======================================
+utf-8 string literals
+=======================================
+
+var a = "lower"u8;
+var b = "upper"U8;
+var c = @"lower"u8;
+var d = @"upper"U8;
+---
+
+ (compilation_unit
+    (global_statement
+      (local_declaration_statement
+        (variable_declaration
+          (implicit_type)
+          (variable_declarator
+            (identifier)
+            (equals_value_clause
+              (string_literal))))))
+    (global_statement
+      (local_declaration_statement
+        (variable_declaration
+          (implicit_type)
+          (variable_declarator
+            (identifier)
+            (equals_value_clause
+              (string_literal))))))
+    (global_statement
+      (local_declaration_statement
+        (variable_declaration
+          (implicit_type)
+          (variable_declarator
+            (identifier)
+            (equals_value_clause
+              (verbatim_string_literal))))))
+    (global_statement
+      (local_declaration_statement
+        (variable_declaration
+          (implicit_type)
+          (variable_declarator
+            (identifier)
+            (equals_value_clause
+              (verbatim_string_literal)))))))
+
 ==================================================
 string literals containing newline
 ==================================================

corpus/type-fields.txt

@@ -242,7 +242,7 @@ class A {
           (variable_declarator (identifier)))))))
 
 =======================================
-Native interger types
+Native integer types
 =======================================
 
 class A {
@@ -264,3 +264,26 @@ class A {
         (variable_declaration
           (predefined_type)
           (variable_declarator (identifier)))))))
+
+
+=======================================
+Required fields
+=======================================
+
+class A {
+  public required int B;
+}
+
+---
+
+(compilation_unit
+  (class_declaration
+    (identifier)
+      (declaration_list
+        (field_declaration
+          (modifier)
+          (modifier)
+          (variable_declaration
+            (predefined_type)
+            (variable_declarator
+              (identifier)))))))

corpus/type-properties.txt

@@ -194,3 +194,27 @@ class Foo: IFoo {
         (explicit_interface_specifier (identifier))
         (identifier)
         (accessor_list (accessor_declaration))))))
+
+
+=======================================
+Required properties
+=======================================
+
+class A {
+  public required int B { get; set; }
+}
+
+---
+
+(compilation_unit
+  (class_declaration
+    (identifier)
+      (declaration_list
+        (property_declaration
+          (modifier)
+          (modifier)
+          (predefined_type)
+          (identifier)
+          (accessor_list
+            (accessor_declaration)
+            (accessor_declaration))))))

grammar.js

@@ -74,6 +74,7 @@ module.exports = grammar({
     [$._contextual_keywords, $.type_parameter_constraint],
 
     [$._type, $.array_creation_expression],
+    [$._type, $.attribute],
     [$._type, $.stack_alloc_array_creation_expression],
     [$._type, $._nullable_base_type],
     [$._type, $._nullable_base_type, $.array_creation_expression],
@@ -258,6 +259,7 @@ module.exports = grammar({
       'protected',
       'public',
       'readonly',
+      'required',
       prec(1, 'ref'), //make sure that 'ref' is treated as a modifier for local variable declarations instead of as a ref expression
       'sealed',
       'static',
@@ -924,12 +926,22 @@ module.exports = grammar({
       $.negated_pattern,
       $.parenthesized_pattern,
       $.relational_pattern,
-      $.binary_pattern,
+      $.or_pattern,
+      $.and_pattern,
+      $.list_pattern,
       $.type_pattern
     ),
 
     type_pattern: $ => $._type,
 
+    list_pattern: $ => seq(
+      '[',
+      optional(seq(commaSep1(choice($._pattern, $.slice_pattern)), optional(','))),
+      ']'
+    ),
+
+    slice_pattern: $ => '..',
+
     parenthesized_pattern: $ => seq('(', $._pattern, ')'),
 
     relational_pattern: $ => prec.left(choice(
@@ -941,18 +953,17 @@ module.exports = grammar({
 
     negated_pattern: $ => seq('not', $._pattern),
 
-    binary_pattern: $ => choice(
-      prec.left(PREC.AND, seq(
-        field('left', $._pattern),
-        field('operator', 'and'),
-        field('right', $._pattern)
-      )),
-      prec.left(PREC.OR, seq(
-        field('left', $._pattern),
-        field('operator', 'or'),
-        field('right', $._pattern)
-      )),
-    ),
+    and_pattern: $ => prec.left(PREC.AND, seq(
+      field('left', $._pattern),
+      field('operator', 'and'),
+      field('right', $._pattern)
+    )),
+
+    or_pattern: $ => prec.left(PREC.OR, seq(
+      field('left', $._pattern),
+      field('operator', 'or'),
+      field('right', $._pattern)
+    )),
 
     //We may need to expand this list if more things can be evaluated at compile time
     constant_pattern: $ => choice(
@@ -1634,7 +1645,7 @@ module.exports = grammar({
         $._string_literal_fragment,
         $.escape_sequence
       )),
-      '"'
+      choice('"', '"U8', '"u8')
     ),
 
     _string_literal_fragment: $ => token.immediate(prec(1, /[^"\\\n]+/)),
@@ -1645,7 +1656,7 @@ module.exports = grammar({
         /[^"]/,
         '""',
       )),
-      '"'
+      choice('"', '"U8', '"u8')
     )),
 
     // Comments