fix: inline anonymous "static" node

Problem: The "trick" of wrapping an anonymous node into a single `choice` or `seq` no longer works as of tree-sitter/tree-sitter#2577 Solution: Inline `"static"` node at its only use site.
tree-sitter-grammars · Jul 8, 2024 · 993dd9c · 993dd9c
1 parent 0a50d31
commit 993dd9c
Show file tree

Hide file tree

Showing 4 changed files with 36,674 additions and 36,794 deletions.
diff --git a/grammar.js b/grammar.js
@@ -281,15 +281,12 @@ module.exports = grammar({
     member_declaration: $ => seq(
       optional($.attribute_declaration),
       choice(
-        seq(optional($.qualifier), $.identifier, '=', choice($.expression, $.table), optional(';')),
+        seq(optional('static'), $.identifier, '=', choice($.expression, $.table), optional(';')),
         seq('[', $.expression, ']', '=', $.expression, optional(';')),
         $.function_declaration,
         seq('constructor', '(', optional($.parameters), ')', $._statement),
       ),
     ),
-    qualifier: _ => choice(
-      'static',
-    ),
 
     try_statement: $ => seq(
       'try',

diff --git a/src/grammar.json b/src/grammar.json
@@ -980,8 +980,8 @@
                   "type": "CHOICE",
                   "members": [
                     {
-                      "type": "SYMBOL",
-                      "name": "qualifier"
+                      "type": "STRING",
+                      "value": "static"
                     },
                     {
                       "type": "BLANK"
@@ -1101,15 +1101,6 @@
         }
       ]
     },
-    "qualifier": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "static"
-        }
-      ]
-    },
     "try_statement": {
       "type": "SEQ",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -1849,10 +1849,6 @@
           "type": "parameters",
           "named": true
         },
-        {
-          "type": "qualifier",
-          "named": true
-        },
         {
           "type": "return",
           "named": true
@@ -1937,11 +1933,6 @@
       ]
     }
   },
-  {
-    "type": "qualifier",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "resume_expression",
     "named": true,