Implemented head tail modifier that works on multiple scope types (#708)

* Implemented head tail modifier that works on multiple scope types

* Fixed test that broke in merge

* Cleanup

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* More cleanup

* More cleanup

* More cleanup

* Fixed line endings

* Updated tests

* Updated tests

* Head and tail modifiers swallow all following modifiers

* Updated tests

* Cleanup

* Cleanup

* Switch head tail stage to use token target instead of plane target

* Cleanup head tail stage

* Reinstate doc string

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

Author: 3 people

src/modifiers/head_tail.py

@@ -0,0 +1,26 @@
+from talon import Module
+
+head_tail_modifiers = {
+    "head": "extendThroughStartOf",
+    "tail": "extendThroughEndOf",
+}
+
+mod = Module()
+
+mod.list(
+    "cursorless_head_tail_modifier",
+    desc="Cursorless head and tail modifiers",
+)
+
+
+@mod.capture(rule="{user.cursorless_head_tail_modifier} <user.cursorless_modifier>*")
+def cursorless_head_tail_modifier(m) -> dict[str, str]:
+    """Cursorless head and tail modifier"""
+    result = {
+        "type": m.cursorless_head_tail_modifier,
+    }
+    try:
+        result["modifiers"] = m.cursorless_modifier_list
+    except AttributeError:
+        pass
+    return result

src/modifiers/modifiers.py

@@ -1,6 +1,7 @@
 from talon import Module, app
 
 from ..csv_overrides import init_csv_and_watch_changes
+from .head_tail import head_tail_modifiers
 from .range_type import range_types
 
 mod = Module()
@@ -11,8 +12,6 @@
     "inside": "interiorOnly",
     "bounds": "excludeInterior",
     "just": "toRawSelection",
-    "head": "extendThroughStartOf",
-    "tail": "extendThroughEndOf",
     "leading": "leading",
     "trailing": "trailing",
 }
@@ -31,11 +30,28 @@ def cursorless_simple_modifier(m) -> dict[str, str]:
     }
 
 
+modifiers = [
+    "<user.cursorless_position>",  # before, end of
+    "<user.cursorless_simple_modifier>",  # inside, bounds, just, leading, trailing
+    "<user.cursorless_head_tail_modifier>",  # head, tail
+    "<user.cursorless_containing_scope>",  # funk, state, class
+    "<user.cursorless_subtoken_scope>",  # first past second word
+    "<user.cursorless_surrounding_pair>",  # matching/pair [curly, round]
+]
+
+
+@mod.capture(rule="|".join(modifiers))
+def cursorless_modifier(m) -> str:
+    """Cursorless modifier"""
+    return m[0]
+
+
 def on_ready():
     init_csv_and_watch_changes(
         "modifiers",
         {
             "simple_modifier": simple_modifiers,
+            "head_tail_modifier": head_tail_modifiers,
             "range_type": range_types,
         },
     )

src/primitive_target.py

@@ -8,21 +8,6 @@
 IMPLICIT_TARGET = {"type": "primitive", "isImplicit": True}
 
 
-modifiers = [
-    "<user.cursorless_position>",  # before, end of
-    "<user.cursorless_simple_modifier>",  # eg inside, bounds, just, head, tail, leading, trailing
-    "<user.cursorless_containing_scope>",  # funk, state, class
-    "<user.cursorless_subtoken_scope>",  # first past second word
-    "<user.cursorless_surrounding_pair>",  # matching/pair [curly, round]
-]
-
-
-@mod.capture(rule="|".join(modifiers))
-def cursorless_modifier(m) -> str:
-    """Cursorless modifier"""
-    return m[0]
-
-
 @mod.capture(
     rule="<user.cursorless_modifier>+ [<user.cursorless_mark>] | <user.cursorless_mark>"
 )