Fixed talon warning messages (#818)

* Fixed talon warning messages

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

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

* Naming / documentation tweaks

* Fix circular import

Co-authored-by: Andreas Arvidsson <andreas.arvidsson@redpill-linpro.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>

Author: 4 people

cursorless-talon/src/cursorless-snippets.talon renamed to cursorless-talon/src/cursorless_snippets.talon

@@ -17,7 +17,7 @@
     rule=(
         "{user.cursorless_head_tail_modifier} "
         "[<user.cursorless_interior_modifier>] "
-        "[<user.cursorless_modifier>]"
+        "[<user.cursorless_head_tail_swallowed_modifier>]"
     )
 )
 def cursorless_head_tail_modifier(m) -> dict[str, str]:
@@ -30,7 +30,7 @@ def cursorless_head_tail_modifier(m) -> dict[str, str]:
         pass
 
     try:
-        modifiers.append(m.cursorless_modifier)
+        modifiers.append(m.cursorless_head_tail_swallowed_modifier)
     except AttributeError:
         pass
 

cursorless-talon/src/modifiers/head_tail.py

@@ -30,23 +30,39 @@ def cursorless_simple_modifier(m) -> dict[str, str]:
     }
 
 
-modifiers = [
-    "<user.cursorless_position>",  # before, end of
+# These are the modifiers that will be "swallowed" by the head/tail modifier.
+# For example, saying "head funk" will result in a "head" modifier that will
+# select past the start of the function.
+# Note that we don't include "inside" here, because that requires slightly
+# special treatment to ensure that "head inside round" swallows "inside round"
+# rather than just "inside".
+head_tail_swallowed_modifiers = [
     "<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
     "<user.cursorless_surrounding_pair>",  # matching/pair [curly, round]
 ]
 
+modifiers = [
+    "<user.cursorless_position>",  # before, end of
+    "<user.cursorless_interior_modifier>",  # inside
+    "<user.cursorless_head_tail_modifier>",  # head, tail
+    *head_tail_swallowed_modifiers,
+]
+
 
 @mod.capture(rule="|".join(modifiers))
 def cursorless_modifier(m) -> str:
     """Cursorless modifier"""
     return m[0]
 
 
+@mod.capture(rule="|".join(head_tail_swallowed_modifiers))
+def cursorless_head_tail_swallowed_modifier(m) -> str:
+    """Cursorless modifier that is swallowed by the head/tail modifier, excluding interior, which requires special treatment"""
+    return m[0]
+
+
 def on_ready():
     init_csv_and_watch_changes(
         "modifiers",