Added argument list scope

Author: AndreasArvidsson

cursorless-talon/src/spoken_forms.json

@@ -125,6 +125,7 @@
   "modifier_scope_types.csv": {
     "scope_type": {
       "arg": "argumentOrParameter",
+      "arg list": "argumentList",
       "attribute": "attribute",
       "call": "functionCall",
       "callee": "functionCallee",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -70,6 +70,8 @@ export const scopeSupportFacets = [
   "argument.formal.constructor",
   "argument.formal.constructor.iteration",
 
+  "argumentList.formal",
+
   "comment.line",
   "comment.block",
 

packages/common/src/types/command/PartialTargetDescriptor.types.ts

@@ -141,6 +141,7 @@ export type SurroundingPairName =
 
 export const simpleScopeTypeTypes = [
   "argumentOrParameter",
+  "argumentList",
   "anonymousFunction",
   "attribute",
   "branch",

packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts

@@ -318,6 +318,39 @@ class SingleOrMultilineDelimiter extends QueryPredicateOperator<SingleOrMultilin
   }
 }
 
+/**
+ * A predicate operator that sets the insertion delimiter of {@link nodeInfo} to
+ * either {@link insertionDelimiterConsequence} or
+ * {@link insertionDelimiterAlternative} depending on whether
+ * {@link conditionNodeInfo} has children or not, respectively. For example,
+ *
+ * ```scm
+ * (#has-children-or-not-delimiter! @foo @bar ", " "")
+ * ```
+ *
+ * will set the insertion delimiter of the `@foo` capture to `", "` if the
+ * `@bar` capture is a single line and `",\n"` otherwise.
+ */
+class HasChildrenOrNotDelimiter extends QueryPredicateOperator<HasChildrenOrNotDelimiter> {
+  name = "has-children-or-not-delimiter!" as const;
+  schema = z.tuple([q.node, q.node, q.string, q.string]);
+
+  run(
+    nodeInfo: MutableQueryCapture,
+    conditionNodeInfo: MutableQueryCapture,
+    insertionDelimiterConsequence: string,
+    insertionDelimiterAlternative: string,
+  ) {
+    nodeInfo.insertionDelimiter = conditionNodeInfo.node.children.some(
+      (child) => child.isNamed,
+    )
+      ? insertionDelimiterConsequence
+      : insertionDelimiterAlternative;
+
+    return true;
+  }
+}
+
 export const queryPredicateOperators = [
   new Log(),
   new NotType(),
@@ -331,5 +364,6 @@ export const queryPredicateOperators = [
   new AllowMultiple(),
   new InsertionDelimiter(),
   new SingleOrMultilineDelimiter(),
+  new HasChildrenOrNotDelimiter(),
   new HasMultipleChildrenOfType(),
 ];

packages/cursorless-engine/src/scopeProviders/ScopeInfoProvider.ts

@@ -111,6 +111,7 @@ function isLanguageSpecific(scopeType: ScopeType): boolean {
   switch (scopeType.type) {
     case "string":
     case "argumentOrParameter":
+    case "argumentList":
     case "anonymousFunction":
     case "attribute":
     case "branch":

packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts

@@ -40,6 +40,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
 
   simpleScopeTypeType: {
     argumentOrParameter: "arg",
+    argumentList: "arg list",
     attribute: "attribute",
     functionCall: "call",
     functionCallee: "callee",

queries/javascript.core.scm

@@ -748,6 +748,16 @@
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
+;;!! foo(name) {}
+;;!      ^^^^
+(_
+  (formal_parameters
+    "(" @argumentList.start.endOf
+    ")" @argumentList.end.startOf
+  ) @_dummy
+  (#has-children-or-not-delimiter! @argumentList.start.endOf @_dummy ", " "")
+) @argumentList.domain
+
 ;;!! foo("bar")
 ;;!      ^^^^^
 (