Updated head tail modifier to not swallow all following modifiers (cursorless-dev#809)

* Updated head tail modifier to not swallow all following modifiers

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

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

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

Author: 4 people

src/modifiers/head_tail.py

@@ -13,14 +13,32 @@
 )
 
 
-@mod.capture(rule="{user.cursorless_head_tail_modifier} <user.cursorless_modifier>*")
+@mod.capture(
+    rule=(
+        "{user.cursorless_head_tail_modifier} "
+        "[<user.cursorless_interior_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,
-    }
+    modifiers = []
+
     try:
-        result["modifiers"] = m.cursorless_modifier_list
+        modifiers.append(m.cursorless_interior_modifier)
     except AttributeError:
         pass
+
+    try:
+        modifiers.append(m.cursorless_modifier)
+    except AttributeError:
+        pass
+
+    result = {
+        "type": m.cursorless_head_tail_modifier,
+    }
+
+    if modifiers:
+        result["modifiers"] = modifiers
+
     return result

src/modifiers/interior.py

@@ -0,0 +1,22 @@
+from talon import Module
+
+# NOTE: Please do not change these dicts.  Use the CSVs for customization.
+# See https://www.cursorless.org/docs/user/customization/
+interior_modifiers = {
+    "inside": "interiorOnly",
+}
+
+mod = Module()
+
+mod.list(
+    "cursorless_interior_modifier",
+    desc="Cursorless interior modifier",
+)
+
+
+@mod.capture(rule="{user.cursorless_interior_modifier}")
+def cursorless_interior_modifier(m) -> dict[str, str]:
+    """Cursorless interior modifier"""
+    return {
+        "type": m.cursorless_interior_modifier,
+    }

src/modifiers/modifiers.py

@@ -2,14 +2,14 @@
 
 from ..csv_overrides import init_csv_and_watch_changes
 from .head_tail import head_tail_modifiers
+from .interior import interior_modifiers
 from .range_type import range_types
 
 mod = Module()
 
 # NOTE: Please do not change these dicts.  Use the CSVs for customization.
 # See https://www.cursorless.org/docs/user/customization/
 simple_modifiers = {
-    "inside": "interiorOnly",
     "bounds": "excludeInterior",
     "just": "toRawSelection",
     "leading": "leading",
@@ -32,7 +32,8 @@ 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_simple_modifier>",  # bounds, just, leading, trailing
+    "<user.cursorless_interior_modifier>",  # inside
     "<user.cursorless_head_tail_modifier>",  # head, tail
     "<user.cursorless_containing_scope>",  # funk, state, class
     "<user.cursorless_subtoken_scope>",  # first past second word
@@ -51,6 +52,7 @@ def on_ready():
         "modifiers",
         {
             "simple_modifier": simple_modifiers,
+            "interior_modifier": interior_modifiers,
             "head_tail_modifier": head_tail_modifiers,
             "range_type": range_types,
         },