fix: add more allowed reserved identifiers & allow them in annotation type element names

Author: amaanq

grammar.js

@@ -53,7 +53,6 @@ module.exports = grammar({
   inline: $ => [
     $._name,
     $._simple_type,
-    $._reserved_identifier,
     $._class_body_declaration,
     $._variable_initializer
   ],
@@ -982,7 +981,7 @@ module.exports = grammar({
     annotation_type_element_declaration: $ => seq(
       optional($.modifiers),
       field('type', $._unannotated_type),
-      field('name', $.identifier),
+      field('name', choice($.identifier, $._reserved_identifier)),
       '(', ')',
       field('dimensions', optional($.dimensions)),
       optional($._default_value),
@@ -1191,11 +1190,17 @@ module.exports = grammar({
       field('body', $.block)
     ),
 
-    _reserved_identifier: $ => alias(choice(
-      'open',
-      'module',
-      'record'
-    ), $.identifier),
+    _reserved_identifier: $ => prec(-3, alias(
+      choice(
+        'open',
+        'module',
+        'record',
+        'with',
+        'yield',
+        'sealed',
+      ),
+      $.identifier,
+    )),
 
     this: $ => 'this',
 

test/corpus/declarations.txt

@@ -848,3 +848,49 @@ non-sealed interface C extends A {}
           (type_list
             (type_identifier)))
         (interface_body)))
+
+====================
+Reserved identifiers
+====================
+
+public @interface Reserved {
+    String module();
+}
+
+public class Keywords {
+  public void demo() {
+    int sealed = 0;
+    bool yield = false;
+  }
+}
+
+---
+
+(program
+  (annotation_type_declaration
+    (modifiers)
+    (identifier)
+    (annotation_type_body
+      (annotation_type_element_declaration
+        (type_identifier)
+        (identifier))))
+  (class_declaration
+    (modifiers)
+    (identifier)
+    (class_body
+      (method_declaration
+        (modifiers)
+        (void_type)
+        (identifier)
+        (formal_parameters)
+        (block
+          (local_variable_declaration
+            (integral_type)
+            (variable_declarator
+              (identifier)
+              (decimal_integer_literal)))
+          (local_variable_declaration
+            (type_identifier)
+            (variable_declarator
+              (identifier)
+              (false))))))))