Adds support for named arguments

tree-sitter · May 3, 2021 · bbd544c · bbd544c
1 parent eac70f9
commit bbd544c
Show file tree

Hide file tree

Showing 7 changed files with 49,251 additions and 49,277 deletions.
diff --git a/grammar.js b/grammar.js
@@ -1012,10 +1012,15 @@ module.exports = grammar({
 
     arguments: $ => seq(
       '(',
-      commaSep(choice($.variadic_unpacking, $._expression)),
+      commaSep($.argument),
       ')'
     ),
 
+    argument: $ => seq(
+      optional(seq(field('name', $.name), ':')),
+      choice($.variadic_unpacking, $._expression)
+    ),
+
     member_call_expression: $ => prec(PREC.CALL, seq(
       field('object', $._dereferencable_expression),
       '->',

diff --git a/src/grammar.json b/src/grammar.json
@@ -5293,17 +5293,8 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "variadic_unpacking"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_expression"
-                    }
-                  ]
+                  "type": "SYMBOL",
+                  "name": "argument"
                 },
                 {
                   "type": "REPEAT",
@@ -5315,17 +5306,8 @@
                         "value": ","
                       },
                       {
-                        "type": "CHOICE",
-                        "members": [
-                          {
-                            "type": "SYMBOL",
-                            "name": "variadic_unpacking"
-                          },
-                          {
-                            "type": "SYMBOL",
-                            "name": "_expression"
-                          }
-                        ]
+                        "type": "SYMBOL",
+                        "name": "argument"
                       }
                     ]
                   }
@@ -5343,6 +5325,49 @@
         }
       ]
     },
+    "argument": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "name",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "name"
+                  }
+                },
+                {
+                  "type": "STRING",
+                  "value": ":"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "variadic_unpacking"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_expression"
+            }
+          ]
+        }
+      ]
+    },
     "member_call_expression": {
       "type": "PREC",
       "value": 22,

diff --git a/src/node-types.json b/src/node-types.json
@@ -379,12 +379,23 @@
     }
   },
   {
-    "type": "arguments",
+    "type": "argument",
     "named": true,
-    "fields": {},
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "name",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
-      "multiple": true,
-      "required": false,
+      "multiple": false,
+      "required": true,
       "types": [
         {
           "type": "_expression",
@@ -397,6 +408,21 @@
       ]
     }
   },
+  {
+    "type": "arguments",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "argument",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "array_creation_expression",
     "named": true,
@@ -4123,11 +4149,11 @@
   },
   {
     "type": "boolean",
-    "named": false
+    "named": true
   },
   {
     "type": "boolean",
-    "named": true
+    "named": false
   },
   {
     "type": "break",
@@ -4339,11 +4365,11 @@
   },
   {
     "type": "null",
-    "named": true
+    "named": false
   },
   {
     "type": "null",
-    "named": false
+    "named": true
   },
   {
     "type": "object",
@@ -4411,11 +4437,11 @@
   },
   {
     "type": "string",
-    "named": true
+    "named": false
   },
   {
     "type": "string",
-    "named": false
+    "named": true
   },
   {
     "type": "switch",