feat: support variadic types and variadic generic parameters

tree-sitter-grammars · May 21, 2024 · 09df169 · 09df169
1 parent 773eae8
commit 09df169
Show file tree

Hide file tree

Showing 5 changed files with 9,739 additions and 9,130 deletions.
diff --git a/grammar.js b/grammar.js
@@ -84,6 +84,10 @@ const optional_block = $ => alias(optional($._block), $.block);
 module.exports = grammar(lua, {
   name: 'luau',
 
+  supertypes: ($, original) => original.concat([
+    $.type,
+  ]),
+
   rules: {
     // Luau has no goto and label statements, and has continue statements
     statement: ($, original) => choice(
@@ -121,13 +125,19 @@ module.exports = grammar(lua, {
       field('body', optional_block($)),
       'end',
     ),
-    generic_type_list: $ => seq('<', commaSep1($.identifier), '>'),
-    _parameter_list: $ => choice(
-      seq(commaSep1($.parameter), optional(seq(',', $.vararg_expression))),
-      $.vararg_expression,
+    generic_type_list: $ => seq(
+      '<',
+      commaSep1(
+        seq($.identifier, optional($.vararg_expression)),
+      ),
+      '>',
     ),
+    _parameter_list: $ => choice(commaSep1($.parameter)),
 
-    parameter: $ => seq($.identifier, optional(seq(':', $.type))),
+    parameter: $ => seq(
+      choice($.identifier, $.vararg_expression),
+      optional(seq(':', $.type)),
+    ),
 
     _att_name_list: $ => sep1(
       seq(
@@ -150,6 +160,7 @@ module.exports = grammar(lua, {
       $.union_type,
       $.optional_type,
       $.literal_type,
+      $.variadic_type,
     )),
 
     builtin_type: _ => choice(
@@ -207,6 +218,8 @@ module.exports = grammar(lua, {
 
     literal_type: $ => choice($.string, $.true, $.false),
 
+    variadic_type: $ => prec.right(seq('...', $.type)),
+
     expression: ($, original) => choice(
       original,
       $.cast_expression,

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -162,6 +162,8 @@
 ((identifier) @variable.builtin
   (#eq? @variable.builtin "self"))
 
+"..." @variable.builtin
+
 ((identifier) @module.builtin
   (#any-of? @module.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1963,56 +1963,26 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "parameter"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "parameter"
-                      }
-                    ]
-                  }
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "parameter"
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "vararg_expression"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "parameter"
+                  }
+                ]
+              }
             }
           ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "vararg_expression"
         }
       ]
     },
@@ -3117,8 +3087,25 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "identifier"
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "vararg_expression"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
             },
             {
               "type": "REPEAT",
@@ -3130,8 +3117,25 @@
                     "value": ","
                   },
                   {
-                    "type": "SYMBOL",
-                    "name": "identifier"
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "CHOICE",
+                        "members": [
+                          {
+                            "type": "SYMBOL",
+                            "name": "vararg_expression"
+                          },
+                          {
+                            "type": "BLANK"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               }
@@ -3148,8 +3152,17 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "vararg_expression"
+            }
+          ]
         },
         {
           "type": "CHOICE",
@@ -3223,6 +3236,10 @@
           {
             "type": "SYMBOL",
             "name": "literal_type"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "variadic_type"
           }
         ]
       }
@@ -3792,6 +3809,23 @@
         }
       ]
     },
+    "variadic_type": {
+      "type": "PREC_RIGHT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "..."
+          },
+          {
+            "type": "SYMBOL",
+            "name": "type"
+          }
+        ]
+      }
+    },
     "cast_expression": {
       "type": "PREC",
       "value": 11,
@@ -4067,6 +4101,7 @@
     "statement",
     "expression",
     "declaration",
-    "variable"
+    "variable",
+    "type"
   ]
 }