Support fully compositional modifiers

.vscode/launch.json

@@ -41,6 +41,27 @@
 				"!**/node_modules/**"
 			]
 		},
+		{
+			"name": "Run Test Subset",
+			"type": "extensionHost",
+			"request": "launch",
+			"env": {
+				"CURSORLESS_TEST": "true",
+				"CURSORLESS_RUN_TEST_SUBSET": "true"
+			},
+			"args": [
+				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+			],
+			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"preLaunchTask": "${defaultBuildTask}",
+			"resolveSourceMapLocations": [
+				"${workspaceFolder}/**",
+				"!${workspaceFolder}/.vscode-sandbox/**",
+				"!**/node_modules/**"
+			]
+		},
 		{
 			"name": "Update fixtures",
 			"type": "extensionHost",
@@ -62,6 +83,28 @@
 				"!**/node_modules/**"
 			]
 		},
+		{
+			"name": "Update fixtures subset",
+			"type": "extensionHost",
+			"request": "launch",
+			"env": {
+				"CURSORLESS_TEST": "true",
+				"CURSORLESS_TEST_UPDATE_FIXTURES": "true",
+				"CURSORLESS_RUN_TEST_SUBSET": "true"
+			},
+			"args": [
+				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+			],
+			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"preLaunchTask": "${defaultBuildTask}",
+			"resolveSourceMapLocations": [
+				"${workspaceFolder}/**",
+				"!${workspaceFolder}/.vscode-sandbox/**",
+				"!**/node_modules/**"
+			]
+		},
 		{
 			"name": "Docusaurus Start (Debug)",
 			"type": "node",

.vscodeignore

@@ -1,16 +1,13 @@
-.vscode/**
-.vscode-test/**
-src/**
-.gitignore
-.yarnrc
-vsc-extension-quickstart.md
-**/tsconfig.json
-**/.eslintrc.json
-**/*.map
-**/*.ts
-node_modules/**
-.vscode-sandbox/**
-out/**
-dist/**
+**
+!CHANGELOG.md
+!cursorless-snippets/**
 !dist/extension.js
-website/**
+!images/hats/**
+!images/icon.png
+!LICENSE
+!NOTICE.md
+!package.json
+!README.md
+!schemas/**
+!third-party-licenses.csv
+!build-info.json

cursorless-talon/src/actions/actions.py

@@ -4,7 +4,7 @@
 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 positional_action_defaults, simple_action_defaults
 
 mod = Module()
 
@@ -79,6 +79,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_makeshift.py

@@ -39,7 +39,7 @@ class MakeshiftAction:
         "editor.action.rename",
         restore_selection=True,
         await_command=False,
-        post_command_sleep_ms=150,
+        post_command_sleep_ms=200,
     ),
 ]
 

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",
@@ -37,8 +36,18 @@
     "unfold": "unfoldRegion",
 }
 
+# NOTE: Please do not change these dicts.  Use the CSVs for customization.
+# See https://www.cursorless.org/docs/user/customization/
+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

@@ -3,24 +3,18 @@
 from ..primitive_target import IMPLICIT_TARGET
 
 mod = Module()
-mod.list(
-    "cursorless_source_destination_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
 
-    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/scopes.py

@@ -4,7 +4,7 @@
 def get_scopes():
     return {
         **get_lists(
-            ["scope_type", "selection_type", "subtoken_scope_type"],
+            ["scope_type", "subtoken_scope_type"],
             {"argumentOrParameter": "Argument"},
         ),
         "<P>": "Paired delimiter",

cursorless-talon/src/command.py

@@ -127,11 +127,13 @@ def construct_cursorless_command_argument(
         use_pre_phrase_snapshot = False
 
     return {
-        "version": 1,
+        "version": 2,
         "spokenForm": get_spoken_form(),
-        "action": action,
+        "action": {
+            "name": action,
+            "args": args,
+        },
         "targets": targets,
-        "extraArgs": args,
         "usePrePhraseSnapshot": use_pre_phrase_snapshot,
     }
 

cursorless-talon/src/compound_targets.py

@@ -44,19 +44,19 @@ def cursorless_range(m) -> str:
         return primitive_targets[0]
 
     if len(primitive_targets) == 1:
-        start = BASE_TARGET.copy()
+        anchor = BASE_TARGET.copy()
     else:
-        start = primitive_targets[0]
+        anchor = primitive_targets[0]
 
     range_connective = range_connective_with_type["connective"]
     range_type = range_connective_with_type["type"]
 
     range = {
         "type": "range",
-        "start": start,
-        "end": primitive_targets[-1],
-        "excludeStart": not is_anchor_included(range_connective),
-        "excludeEnd": not is_active_included(range_connective),
+        "anchor": anchor,
+        "active": primitive_targets[-1],
+        "excludeAnchor": not is_anchor_included(range_connective),
+        "excludeActive": not is_active_included(range_connective),
     }
 
     if range_type:
@@ -79,4 +79,7 @@ def is_active_included(range_connective: str):
 def cursorless_target(m) -> dict:
     if len(m.cursorless_range_list) == 1:
         return m.cursorless_range
-    return {"type": "list", "elements": m.cursorless_range_list}
+    return {
+        "type": "list",
+        "elements": m.cursorless_range_list,
+    }

cursorless-talon/src/connective.py

@@ -1,7 +1,15 @@
-from talon import app
+from talon import Module, app
 
 from .csv_overrides import init_csv_and_watch_changes
 
+mod = Module()
+
+mod.list(
+    "cursorless_source_destination_connective",
+    desc="The connective used to separate source and destination targets",
+)
+
+
 # NOTE: Please do not change these dicts.  Use the CSVs for customization.
 # See https://www.cursorless.org/docs/user/customization/
 range_connectives = {
@@ -11,6 +19,7 @@
     "until": "rangeExcludingEnd",
 }
 
+
 default_range_connective = "rangeInclusive"
 
 

cursorless-talon/src/csv_overrides.py

@@ -159,6 +159,14 @@ def update_dicts(
         key = obj["key"]
         if not is_removed(key):
             for k in key.split("|"):
+                if value == "pasteFromClipboard" and k.endswith(" to"):
+                    # FIXME: This is a hack to work around the fact that the
+                    # spoken form of the `pasteFromClipboard` action used to be
+                    # "paste to", but now the spoken form is just "paste" and
+                    # the "to" is part of the positional target. Users who had
+                    # cursorless before this change would have "paste to" as
+                    # their spoken form and so would need to say "paste to to".
+                    k = k[:-3]
                 results[obj["list"]][k.strip()] = value
 
     # Assign result to talon context list

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/marks/lines_number.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Any, Callable
 
 from talon import Context, Module
 
@@ -13,7 +14,7 @@ class CustomizableTerm:
     defaultSpokenForm: str
     cursorlessIdentifier: str
     type: str
-    formatter: callable
+    formatter: Callable
 
 
 # NOTE: Please do not change these dicts.  Use the CSVs for customization.
@@ -33,18 +34,15 @@ class CustomizableTerm:
 
 
 @mod.capture(rule="{user.cursorless_line_direction} <number_small>")
-def cursorless_line_number(m) -> str:
+def cursorless_line_number(m) -> dict[str, Any]:
     direction = directions_map[m.cursorless_line_direction]
     line_number = m.number_small
     line = {
         "lineNumber": direction.formatter(line_number),
         "type": direction.type,
     }
     return {
-        "selectionType": "line",
-        "mark": {
-            "type": "lineNumber",
-            "anchor": line,
-            "active": line,
-        },
+        "type": "lineNumber",
+        "anchor": line,
+        "active": line,
     }

cursorless-talon/src/marks/mark.py

@@ -43,19 +43,17 @@
 @mod.capture(
     rule="[{user.cursorless_hat_color}] [{user.cursorless_hat_shape}] <user.any_alphanumeric_key>"
 )
-def cursorless_decorated_symbol(m) -> dict[str, dict[str, Any]]:
+def cursorless_decorated_symbol(m) -> dict[str, Any]:
     """A decorated symbol"""
     hat_color = getattr(m, "cursorless_hat_color", "default")
     try:
         hat_style_name = f"{hat_color}-{m.cursorless_hat_shape}"
     except AttributeError:
         hat_style_name = hat_color
     return {
-        "mark": {
-            "type": "decoratedSymbol",
-            "symbolColor": hat_style_name,
-            "character": m.any_alphanumeric_key,
-        }
+        "type": "decoratedSymbol",
+        "symbolColor": hat_style_name,
+        "character": m.any_alphanumeric_key,
     }
 
 
@@ -69,10 +67,10 @@ class CustomizableTerm:
 # NOTE: Please do not change these dicts.  Use the CSVs for customization.
 # See https://www.cursorless.org/docs/user/customization/
 special_marks = [
-    CustomizableTerm("this", "currentSelection", {"mark": {"type": "cursor"}}),
-    CustomizableTerm("that", "previousTarget", {"mark": {"type": "that"}}),
-    CustomizableTerm("source", "previousSource", {"mark": {"type": "source"}}),
-    CustomizableTerm("nothing", "nothing", {"mark": {"type": "nothing"}}),
+    CustomizableTerm("this", "currentSelection", {"type": "cursor"}),
+    CustomizableTerm("that", "previousTarget", {"type": "that"}),
+    CustomizableTerm("source", "previousSource", {"type": "source"}),
+    CustomizableTerm("nothing", "nothing", {"type": "nothing"}),
     # "last cursor": {"mark": {"type": "lastCursorPosition"}} # Not implemented
 ]
 
@@ -93,7 +91,7 @@ class CustomizableTerm:
         "<user.cursorless_line_number>"  # row (ie absolute mod 100), up, down
     )
 )
-def cursorless_mark(m) -> str:
+def cursorless_mark(m) -> dict[str, Any]:
     try:
         return m.cursorless_decorated_symbol
     except AttributeError: