Limit before/after to certain contexts

cursorless-talon/src/actions/actions.py

@@ -4,7 +4,11 @@
 from .actions_callback import callback_action_defaults, callback_action_map
 from .actions_custom import custom_action_defaults
 from .actions_makeshift import makeshift_action_defaults, makeshift_action_map
-from .actions_simple import simple_action_defaults
+from .actions_simple import (
+    no_wait_actions,
+    positional_action_defaults,
+    simple_action_defaults,
+)
 
 mod = Module()
 
@@ -83,6 +87,7 @@ def vscode_command_no_wait(command_id: str, target: dict, command_options: dict
 
 default_values = {
     "simple_action": simple_action_defaults,
+    "positional_action": positional_action_defaults,
     "callback_action": callback_action_defaults,
     "makeshift_action": makeshift_action_defaults,
     "custom_action": custom_action_defaults,

cursorless-talon/src/actions/actions_simple.py

@@ -24,7 +24,6 @@
     "give": "deselect",
     "highlight": "highlight",
     "indent": "indentLine",
-    "paste to": "pasteFromClipboard",
     "post": "setSelectionAfter",
     "pour": "editNewLineAfter",
     "pre": "setSelectionBefore",
@@ -43,8 +42,18 @@
     "generateSnippet",
 ]
 
+# NOTE: Please do not change these dicts.  Use the CSVs for customization.
+# See https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md
+positional_action_defaults = {
+    "paste": "pasteFromClipboard",
+}
+
 mod = Module()
 mod.list(
     "cursorless_simple_action",
     desc="Supported simple actions for cursorless navigation",
 )
+mod.list(
+    "cursorless_positional_action",
+    desc="Supported actions for cursorless that expect a positional target",
+)

cursorless-talon/src/actions/call.py

@@ -6,5 +6,5 @@
 
 
 def run_call_action(target: dict):
-    targets = [target, IMPLICIT_TARGET]
+    targets = [target, IMPLICIT_TARGET.copy()]
     actions.user.cursorless_multiple_target_command("callAsFunction", targets)

cursorless-talon/src/actions/move_bring.py

@@ -4,23 +4,21 @@
 
 mod = Module()
 mod.list(
-    "cursorless_source_destination_connective",
+    "cursorless_positional_connective",
     desc="The connective used to separate source and destination targets",
 )
 
 
 mod.list("cursorless_move_bring_action", desc="Cursorless move or bring actions")
 
 
-@mod.capture(
-    rule=(
-        "<user.cursorless_target> [{user.cursorless_source_destination_connective} <user.cursorless_target>]"
-    )
-)
+@mod.capture(rule=("<user.cursorless_target> [<user.cursorless_positional_target>]"))
 def cursorless_move_bring_targets(m) -> list[dict]:
-    target_list = m.cursorless_target_list
+    target_list = [m.cursorless_target]
 
-    if len(target_list) == 1:
-        target_list = target_list + [IMPLICIT_TARGET]
+    try:
+        target_list += [m.cursorless_positional_target]
+    except AttributeError:
+        target_list += [IMPLICIT_TARGET.copy()]
 
     return target_list

cursorless-talon/src/cheatsheet/sections/actions.py

@@ -27,9 +27,9 @@ def get_actions():
     }
 
     swap_connective = list(get_raw_list("swap_connective").keys())[0]
-    source_destination_connective = list(
-        get_raw_list("source_destination_connective").keys()
-    )[0]
+    positional_connectives = {
+        value: key for key, value in get_raw_list("positional_connective").items()
+    }
 
     make_dict_readable(
         simple_actions,
@@ -39,10 +39,14 @@ def get_actions():
     )
     return {
         **simple_actions,
-        f"{complex_actions['replaceWithTarget']} <T1> {source_destination_connective} <T2>": "Replace T2 with T1",
-        f"{complex_actions['replaceWithTarget']} <T>": "Replace S with T",
-        f"{complex_actions['moveToTarget']} <T1> {source_destination_connective} <T2>": "Move T1 to T2",
-        f"{complex_actions['moveToTarget']} <T>": "Move T to S",
+        f"{complex_actions['replaceWithTarget']} T1 {positional_connectives['contentConnective']} T2": "Replace T2 with T1",
+        f"{complex_actions['replaceWithTarget']} T1 {positional_connectives['afterConnective']} T2": "Copy T2 after T1",
+        f"{complex_actions['replaceWithTarget']} T1 {positional_connectives['beforeConnective']} T2": "Copy T2 before T1",
+        f"{complex_actions['replaceWithTarget']} T": "Replace S with T",
+        f"{complex_actions['moveToTarget']} T1 {positional_connectives['contentConnective']} T2": "Move T1 to T2",
+        f"{complex_actions['moveToTarget']} T1 {positional_connectives['afterConnective']} T2": "Move T1 after T2",
+        f"{complex_actions['moveToTarget']} T1 {positional_connectives['beforeConnective']} T2": "Move T1 before T2",
+        f"{complex_actions['moveToTarget']} T": "Move T to S",
         f"{complex_actions['swapTargets']} <T1> {swap_connective} <T2>": "Swap T1 with T2",
         f"{complex_actions['swapTargets']} {swap_connective} <T>": "Swap S with T",
         f"{complex_actions['applyFormatter']} <F> at <T>": "Reformat T as F",

cursorless-talon/src/command.py

@@ -56,7 +56,7 @@ def cursorless_this_command(
     ):
         """Execute cursorless command, passing `this` as single target"""
         actions.user.cursorless_multiple_target_command(
-            action, [IMPLICIT_TARGET], arg1, arg2, arg3
+            action, [IMPLICIT_TARGET.copy()], arg1, arg2, arg3
         )
 
     def cursorless_single_target_command_with_arg_list(

cursorless-talon/src/connective.py

@@ -11,6 +11,14 @@
     "until": "rangeExcludingEnd",
 }
 
+# NOTE: Please do not change these dicts.  Use the CSVs for customization.
+# See https://github.com/pokey/cursorless-talon/blob/main/docs/customization.md
+positional_connectives = {
+    "after": "afterConnective",
+    "before": "beforeConnective",
+    "to": "contentConnective",
+}
+
 default_range_connective = "rangeInclusive"
 
 
@@ -21,7 +29,7 @@ def on_ready():
             "range_connective": range_connectives,
             "list_connective": {"and": "listConnective"},
             "swap_connective": {"with": "swapConnective"},
-            "source_destination_connective": {"to": "sourceDestinationConnective"},
+            "positional_connective": positional_connectives,
         },
     )
 

cursorless-talon/src/cursorless-snippets.talon

@@ -5,8 +5,8 @@ tag: user.cursorless_experimental_snippets
 {user.cursorless_insert_snippet_action} <user.cursorless_insertion_snippet>:
     user.cursorless_this_command(cursorless_insert_snippet_action, cursorless_insertion_snippet)
 
-{user.cursorless_insert_snippet_action} <user.cursorless_insertion_snippet> <user.cursorless_target>:
-    user.cursorless_single_target_command(cursorless_insert_snippet_action, cursorless_target, cursorless_insertion_snippet)
+{user.cursorless_insert_snippet_action} <user.cursorless_insertion_snippet> <user.cursorless_positional_target>:
+    user.cursorless_single_target_command(cursorless_insert_snippet_action, cursorless_positional_target, cursorless_insertion_snippet)
 
 {user.cursorless_insert_snippet_action} {user.cursorless_insertion_snippet_single_phrase} <user.text> [halt]:
     user.cursorless_insert_snippet_with_phrase(cursorless_insert_snippet_action, cursorless_insertion_snippet_single_phrase, text)

cursorless-talon/src/cursorless.talon

@@ -4,6 +4,9 @@ app: vscode
 <user.cursorless_action_or_vscode_command> <user.cursorless_target>:
     user.cursorless_action_or_vscode_command(cursorless_action_or_vscode_command, cursorless_target)
 
+{user.cursorless_positional_action} <user.cursorless_positional_target>:
+    user.cursorless_single_target_command(cursorless_positional_action, cursorless_positional_target)
+
 {user.cursorless_swap_action} <user.cursorless_swap_targets>:
     user.cursorless_multiple_target_command(cursorless_swap_action, cursorless_swap_targets)
 

cursorless-talon/src/modifiers/position.py

@@ -5,8 +5,6 @@
 
 
 positions = {
-    "after": {"position": "after"},
-    "before": {"position": "before"},
     "start of": {"position": "before", "insideOutsideType": "inside"},
     "end of": {"position": "after", "insideOutsideType": "inside"},
     # Disabled for now because "below" can misrecognize with "blue" and we may move away from allowing positional modifiers in arbitrary places anyway

cursorless-talon/src/positional_target.py

@@ -0,0 +1,39 @@
+from talon import Module
+
+mod = Module()
+
+
+@mod.capture(rule=("{user.cursorless_positional_connective} <user.cursorless_target>"))
+def cursorless_positional_target(m) -> list[dict]:
+    return process_positional_connective(
+        m.cursorless_positional_connective, m.cursorless_target
+    )
+
+
+def process_positional_connective(cursorless_positional_connective: str, target: dict):
+    if cursorless_positional_connective == "afterConnective":
+        return update_first_primitive_target(target, {"position": "after"})
+    elif cursorless_positional_connective == "beforeConnective":
+        return update_first_primitive_target(target, {"position": "before"})
+
+    return target
+
+
+def update_first_primitive_target(target: dict, fields: dict):
+    if target["type"] == "primitive":
+        return {**target, **fields}
+    elif target["type"] == "range":
+        return {
+            **target,
+            "start": update_first_primitive_target(target["start"], fields),
+        }
+    else:
+        elements = target["elements"]
+
+        return {
+            **target,
+            "elements": [
+                update_first_primitive_target(elements[0], fields),
+                *elements[1:],
+            ],
+        }