feat: add arguments node for call arguments

This is mainly for being able to select the arguments for textobject queries.
tree-sitter-grammars · Apr 25, 2023 · 5be42c8 · 5be42c8
1 parent 048b8ab
commit 5be42c8
Show file tree

Hide file tree

Showing 8 changed files with 86,854 additions and 86,624 deletions.
diff --git a/grammar.js b/grammar.js
@@ -435,12 +435,15 @@ module.exports = grammar({
 
     call_expression: $ => prec(PREC.CALL, seq(
       field('callee', $.expression),
+      $.arguments,
+      optional('?'),
+    )),
+    arguments: $ => seq(
       token.immediate('('),
-      commaSep($.expression),
+      field('positional', commaSep($.expression)),
       optional($.named_arguments),
       ')',
-      optional('?'),
-    )),
+    ),
 
     chain_expression: $ => prec.right(PREC.CALL, seq(
       $.expression,

diff --git a/src/grammar.json b/src/grammar.json
@@ -3924,13 +3924,38 @@
             }
           },
           {
-            "type": "IMMEDIATE_TOKEN",
-            "content": {
-              "type": "STRING",
-              "value": "("
-            }
+            "type": "SYMBOL",
+            "name": "arguments"
           },
           {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "?"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "arguments": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "IMMEDIATE_TOKEN",
+          "content": {
+            "type": "STRING",
+            "value": "("
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "positional",
+          "content": {
             "type": "CHOICE",
             "members": [
               {
@@ -3962,37 +3987,25 @@
                 "type": "BLANK"
               }
             ]
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "named_arguments"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          },
-          {
-            "type": "STRING",
-            "value": ")"
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "?"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
           }
-        ]
-      }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "named_arguments"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
     },
     "chain_expression": {
       "type": "PREC_RIGHT",

diff --git a/src/node-types.json b/src/node-types.json
@@ -414,6 +414,36 @@
       ]
     }
   },
+  {
+    "type": "arguments",
+    "named": true,
+    "fields": {
+      "positional": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": ",",
+            "named": false
+          },
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "named_arguments",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "array_literal",
     "named": true,
@@ -779,15 +809,11 @@
       }
     },
     "children": {
-      "multiple": true,
-      "required": false,
+      "multiple": false,
+      "required": true,
       "types": [
         {
-          "type": "expression",
-          "named": true
-        },
-        {
-          "type": "named_arguments",
+          "type": "arguments",
           "named": true
         }
       ]