Support calls with more than 2 arguments

This closes sourcegraph/tree-sitter-jsonnet#5 test plan: make test
Duologic · Dec 11, 2022 · f4e2d85 · f4e2d85
1 parent 0475a50
commit f4e2d85
Show file tree

Hide file tree

Showing 5 changed files with 3,623 additions and 3,519 deletions.
diff --git a/grammar.js b/grammar.js
@@ -190,13 +190,13 @@ module.exports = grammar({
             choice(
                 seq(
                     $.expr,
-                    optional(seq(",", $.expr)),
-                    optional(seq(",", $.named_argument)),
+                    repeat(seq(",", $.expr)),
+                    repeat(seq(",", $.named_argument)),
                     optional(",")
                 ),
                 seq(
                     $.named_argument,
-                    optional(seq(",", $.named_argument)),
+                    repeat(seq(",", $.named_argument)),
                     optional(",")
                 )
             ),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1311,46 +1311,36 @@
               "name": "expr"
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "expr"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "expr"
+                  }
+                ]
+              }
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "named_argument"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "named_argument"
+                  }
+                ]
+              }
             },
             {
               "type": "CHOICE",
@@ -1374,25 +1364,20 @@
               "name": "named_argument"
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "named_argument"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "named_argument"
+                  }
+                ]
+              }
             },
             {
               "type": "CHOICE",