Added argument to call action (#1900)

`call air on bat`

## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [x] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [x] I have not broken the cheatsheet

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: David Vo <[email protected]>
Co-authored-by: Pokey Rule <[email protected]>

Author: 4 people

src/actions/actions.py

@@ -8,7 +8,6 @@
     ImplicitDestination,
 )
 from .bring_move import BringMoveTargets
-from .call import cursorless_call_action
 from .execute_command import cursorless_execute_command_action
 from .homophones import cursorless_homophones_action
 from .replace import cursorless_replace_action
@@ -44,11 +43,11 @@
     "wrap_action",
     "insert_snippet_action",
     "reformat_action",
+    "call_action",
     "experimental_action",
 ]
 
 callback_actions: dict[str, Callable[[CursorlessTarget], None]] = {
-    "callAsFunction": cursorless_call_action,
     "findInDocument": actions.user.private_cursorless_find,
     "nextHomophone": cursorless_homophones_action,
 }
@@ -70,6 +69,7 @@
         "{user.cursorless_simple_action} |"
         "{user.cursorless_experimental_action} |"
         "{user.cursorless_callback_action} |"
+        "{user.cursorless_call_action} |"
         "{user.cursorless_custom_action}"
     )
 )
@@ -96,6 +96,8 @@ def cursorless_command(action_name: str, target: CursorlessTarget):
             actions.user.private_cursorless_bring_move(
                 action_name, BringMoveTargets(target, ImplicitDestination())
             )
+        elif action_name == "callAsFunction":
+            actions.user.private_cursorless_call(target)
         elif action_name in no_wait_actions:
             action = {"name": action_name, "target": target}
             actions.user.private_cursorless_command_no_wait(action)

src/actions/call.py

@@ -1,13 +1,22 @@
-from talon import actions
+from talon import Module, actions
 
 from ..targets.target_types import CursorlessTarget, ImplicitTarget
 
+mod = Module()
+mod.list("cursorless_call_action", desc="Cursorless call action")
 
-def cursorless_call_action(target: CursorlessTarget):
-    actions.user.private_cursorless_command_and_wait(
-        {
-            "name": "callAsFunction",
-            "callee": target,
-            "argument": ImplicitTarget(),
-        }
-    )
+
+@mod.action_class
+class Actions:
+    def private_cursorless_call(
+        callee: CursorlessTarget,
+        argument: CursorlessTarget = ImplicitTarget(),
+    ):
+        """Execute Cursorless call action"""
+        actions.user.private_cursorless_command_and_wait(
+            {
+                "name": "callAsFunction",
+                "callee": callee,
+                "argument": argument,
+            }
+        )

src/cheatsheet/sections/actions.py

@@ -12,6 +12,7 @@ def get_actions():
         "moveToTarget",
         "swapTargets",
         "applyFormatter",
+        "callAsFunction",
         "wrapWithPairedDelimiter",
         "rewrap",
         "pasteFromClipboard",
@@ -34,7 +35,6 @@ def get_actions():
             "action",
             simple_actions,
             {
-                "callAsFunction": "Call <target> on selection",
                 "editNewLineAfter": "Edit new line/scope after",
                 "editNewLineBefore": "Edit new line/scope before",
             },
@@ -101,6 +101,20 @@ def get_actions():
                 }
             ],
         },
+        {
+            "id": "callAsFunction",
+            "type": "action",
+            "variations": [
+                {
+                    "spokenForm": f"{complex_actions['callAsFunction']} <target>",
+                    "description": "Call <target> on selection",
+                },
+                {
+                    "spokenForm": f"{complex_actions['callAsFunction']} <target 1> on <target 2>",
+                    "description": "Call <target 1> on <target 2>",
+                },
+            ],
+        },
         {
             "id": "wrapWithPairedDelimiter",
             "type": "action",

src/cursorless.talon

@@ -18,6 +18,9 @@ tag: user.cursorless
 {user.cursorless_reformat_action} <user.formatters> at <user.cursorless_target>:
     user.private_cursorless_reformat(cursorless_target, formatters)
 
+{user.cursorless_call_action} <user.cursorless_target> on <user.cursorless_target>:
+    user.private_cursorless_call(cursorless_target_1, cursorless_target_2)
+
 <user.cursorless_wrapper_paired_delimiter> {user.cursorless_wrap_action} <user.cursorless_target>:
     user.private_cursorless_wrap_with_paired_delimiter(cursorless_wrap_action, cursorless_target, cursorless_wrapper_paired_delimiter)
 

src/spoken_forms.json

@@ -43,7 +43,6 @@
       "unfold": "unfoldRegion"
     },
     "callback_action": {
-      "call": "callAsFunction",
       "scout": "findInDocument",
       "phones": "nextHomophone"
     },
@@ -55,7 +54,8 @@
     "swap_action": { "swap": "swapTargets" },
     "wrap_action": { "wrap": "wrapWithPairedDelimiter", "repack": "rewrap" },
     "insert_snippet_action": { "snippet": "insertSnippet" },
-    "reformat_action": { "format": "applyFormatter" }
+    "reformat_action": { "format": "applyFormatter" },
+    "call_action": { "call": "callAsFunction" }
   },
   "target_connectives.csv": {
     "range_connective": {

src/spoken_forms.py

@@ -54,7 +54,7 @@ def update():
     for disposable in disposables:
         disposable()
 
-    with open(JSON_FILE) as file:
+    with open(JSON_FILE, encoding="utf-8") as file:
         spoken_forms = json.load(file)
 
     handle_csv = auto_construct_defaults(spoken_forms, init_csv_and_watch_changes)