From 7f701dda02748800e9904901776e65d25a40b1aa Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 25 May 2025 15:16:35 +0200 Subject: [PATCH 1/4] Support scout actions in fallback --- cursorless-talon/src/fallback.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cursorless-talon/src/fallback.py b/cursorless-talon/src/fallback.py index 1c95cd5f36..26f3b75534 100644 --- a/cursorless-talon/src/fallback.py +++ b/cursorless-talon/src/fallback.py @@ -7,8 +7,10 @@ # This ensures that we remember to update fallback if the response payload changes assert COMMAND_VERSION == 7 +selected_text = actions.edit.selected_text + action_callbacks = { - "getText": lambda: [actions.edit.selected_text()], + "getText": lambda: [selected_text()], "setSelection": actions.skip, "setSelectionBefore": actions.edit.left, "setSelectionAfter": actions.edit.right, @@ -20,6 +22,8 @@ "editNewLineBefore": actions.edit.line_insert_up, "editNewLineAfter": actions.edit.line_insert_down, "insertCopyAfter": actions.edit.line_clone, + "findInWorkspace": lambda: actions.user.find_everywhere(selected_text()), + "findInDocument": lambda: actions.edit.find(selected_text()), } modifier_callbacks = { From c7044a834a32927981cd06b2df50298850d3be36 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 25 May 2025 15:17:24 +0200 Subject: [PATCH 2/4] Sort --- cursorless-talon/src/fallback.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cursorless-talon/src/fallback.py b/cursorless-talon/src/fallback.py index 26f3b75534..22c1cf6e2d 100644 --- a/cursorless-talon/src/fallback.py +++ b/cursorless-talon/src/fallback.py @@ -11,6 +11,8 @@ action_callbacks = { "getText": lambda: [selected_text()], + "findInWorkspace": lambda: actions.user.find_everywhere(selected_text()), + "findInDocument": lambda: actions.edit.find(selected_text()), "setSelection": actions.skip, "setSelectionBefore": actions.edit.left, "setSelectionAfter": actions.edit.right, @@ -22,8 +24,6 @@ "editNewLineBefore": actions.edit.line_insert_up, "editNewLineAfter": actions.edit.line_insert_down, "insertCopyAfter": actions.edit.line_clone, - "findInWorkspace": lambda: actions.user.find_everywhere(selected_text()), - "findInDocument": lambda: actions.edit.find(selected_text()), } modifier_callbacks = { From d43fb23c25d7ad28969d71d6b778bcc5b4b7a18d Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 25 May 2025 15:21:07 +0200 Subject: [PATCH 3/4] Clean up --- cursorless-talon/src/fallback.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cursorless-talon/src/fallback.py b/cursorless-talon/src/fallback.py index 22c1cf6e2d..abd17bc891 100644 --- a/cursorless-talon/src/fallback.py +++ b/cursorless-talon/src/fallback.py @@ -7,12 +7,8 @@ # This ensures that we remember to update fallback if the response payload changes assert COMMAND_VERSION == 7 -selected_text = actions.edit.selected_text action_callbacks = { - "getText": lambda: [selected_text()], - "findInWorkspace": lambda: actions.user.find_everywhere(selected_text()), - "findInDocument": lambda: actions.edit.find(selected_text()), "setSelection": actions.skip, "setSelectionBefore": actions.edit.left, "setSelectionAfter": actions.edit.right, @@ -79,6 +75,12 @@ def get_action_callback(fallback: dict) -> Callable: return lambda: wrap_with_paired_delimiter( fallback["left"], fallback["right"] ) + case "getText": + return lambda: [actions.edit.selected_text()] + case "findInWorkspace": + return lambda: actions.user.find_everywhere(actions.edit.selected_text()) + case "findInDocument": + return lambda: actions.edit.find(actions.edit.selected_text()) raise ValueError(f"Unknown Cursorless fallback action: {action}") From 4e138b3bbd31352569328c41218b052466aeb0b8 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 25 May 2025 15:21:37 +0200 Subject: [PATCH 4/4] Clean up --- cursorless-talon/src/fallback.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cursorless-talon/src/fallback.py b/cursorless-talon/src/fallback.py index abd17bc891..f3c3541b29 100644 --- a/cursorless-talon/src/fallback.py +++ b/cursorless-talon/src/fallback.py @@ -7,7 +7,6 @@ # This ensures that we remember to update fallback if the response payload changes assert COMMAND_VERSION == 7 - action_callbacks = { "setSelection": actions.skip, "setSelectionBefore": actions.edit.left,