fix: multiple modifiers on a class

tree-sitter · Oct 3, 2023 · 92a98ad · 92a98ad
1 parent a05c611
commit 92a98ad
Show file tree

Hide file tree

Showing 5 changed files with 69,117 additions and 67,309 deletions.
diff --git a/grammar.js b/grammar.js
@@ -284,7 +284,8 @@ module.exports = grammar({
 
     class_declaration: $ => prec.right(seq(
       optional(field('attributes', $.attribute_list)),
-      optional(field('modifier', choice($.final_modifier, $.abstract_modifier, $.readonly_modifier))),
+      optional(field('modifier', choice($.final_modifier, $.abstract_modifier))),
+      optional(field('modifier', $.readonly_modifier)),
       keyword('class'),
       field('name', $.name),
       optional($.base_clause),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1220,10 +1220,6 @@
                     {
                       "type": "SYMBOL",
                       "name": "abstract_modifier"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "readonly_modifier"
                     }
                   ]
                 }
@@ -1233,6 +1229,22 @@
               }
             ]
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "modifier",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "readonly_modifier"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "ALIAS",
             "content": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -1350,7 +1350,7 @@
         ]
       },
       "modifier": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {