rewrite

Author: phillco

cursorless-talon/src/snippets/snippet_types.py

@@ -48,7 +48,7 @@ class CustomInsertionSnippet:
     @staticmethod
     def create(
         snippet: CommunityInsertionSnippet,
-        substitutions: dict[str, str] | None,
+        substitutions: dict[str, str] | None = None,
     ):
         return CustomInsertionSnippet(
             snippet.body,

cursorless-talon/src/snippets/snippets.py

@@ -18,10 +18,10 @@
     to_scope_types,
 )
 from .snippets_get import (
-    get_custom_insertion_snippet,
-    get_custom_wrapper_snippet,
     get_insertion_snippet,
     get_wrapper_snippet,
+    get_list_insertion_snippet,
+    get_list_wrapper_snippet,
 )
 
 mod = Module()
@@ -34,85 +34,43 @@
 mod.list("cursorless_insert_snippet_action", desc="Cursorless insert snippet action")
 
 
-def insert_snippet(
-    snippet: CustomInsertionSnippet | ListInsertionSnippet,
-    destination: CursorlessDestination,
-):
-    actions.user.private_cursorless_command_and_wait(
-        InsertSnippetAction(snippet, destination),
-    )
-
-
-def wrap_with_snippet(
-    snippet: CustomWrapperSnippet | ListWrapperSnippet,
-    target: CursorlessTarget,
-):
-    actions.user.private_cursorless_command_and_wait(
-        WrapperSnippetAction(snippet, target),
-    )
-
-
-def insert_community_snippet(
-    name: str,
-    substitutions: dict[str, str] | None,
-    destination: CursorlessDestination,
-    use_list: bool,
-):
-    snippet = (
-        get_insertion_snippet(name, substitutions)
-        if use_list
-        else get_custom_insertion_snippet(name, substitutions)
-    )
-    insert_snippet(snippet, destination)
-
-
-def wrap_with_community_snippet(
-    name: str,
-    target: CursorlessTarget,
-    use_list: bool,
-):
-    snippet = (
-        get_wrapper_snippet(name) if use_list else get_custom_wrapper_snippet(name)
-    )
-    wrap_with_snippet(snippet, target)
-
-
 @ctx.action_class("user")
 class UserActions:
-    # These actions use list snippets since no language mode is forced
+    # Since we don't have a forced language mode, these actions send all the snippets.
+    # (note that this is the default mode of action, as most of the time the user will not
+    # have a forced language mode)
 
     def insert_snippet_by_name(
         name: str,  # pyright: ignore [reportGeneralTypeIssues]
         # Don't add optional; We need to match the type in community
         substitutions: dict[str, str] = None,
     ):
-        insert_community_snippet(
-            name,
-            substitutions,
+        action = InsertSnippetAction(
+            get_list_insertion_snippet(name, substitutions),
             ImplicitDestination(),
-            use_list=True,
         )
+        actions.user.private_cursorless_command_and_wait(action)
+
 
     def private_cursorless_insert_community_snippet(
         name: str,  # pyright: ignore [reportGeneralTypeIssues]
         destination: CursorlessDestination,
     ):
-        insert_community_snippet(
-            name,
-            substitutions=None,
-            destination=destination,
-            use_list=True,
+        action = InsertSnippetAction(
+            get_list_insertion_snippet(name),
+            destination,
         )
+        actions.user.private_cursorless_command_and_wait(action)
 
     def private_cursorless_wrap_with_community_snippet(
         name: str,  # pyright: ignore [reportGeneralTypeIssues]
         target: CursorlessTarget,
     ):
-        wrap_with_community_snippet(
-            name,
+        action = WrapperSnippetAction(
+            get_list_wrapper_snippet(name),
             target,
-            use_list=True,
         )
+        actions.user.private_cursorless_command_and_wait(action)
 
 
 @mod.action_class
@@ -129,7 +87,8 @@ def cursorless_insert_snippet(
             languages=None,
             substitutions=None,
         )
-        insert_snippet(snippet, destination)
+        action = InsertSnippetAction(snippet, destination)
+        actions.user.private_cursorless_command_and_wait(action)
 
     def cursorless_wrap_with_snippet(
         body: str,  # pyright: ignore [reportGeneralTypeIssues]
@@ -144,7 +103,8 @@ def cursorless_wrap_with_snippet(
             ScopeType(scope) if scope else None,
             languages=None,
         )
-        wrap_with_snippet(snippet, target)
+        action = WrapperSnippetAction(snippet, target)
+        actions.user.private_cursorless_command_and_wait(action)
 
     # These actions use a single custom snippets since a language mode is forced
 
@@ -153,20 +113,21 @@ def private_cursorless_insert_community_snippet(
         destination: CursorlessDestination,
     ):
         """Cursorless: Insert community snippet <name>"""
-        insert_community_snippet(
-            name,
-            substitutions=None,
-            destination=destination,
-            use_list=False,
+        action = InsertSnippetAction(
+            CustomInsertionSnippet.create(
+                actions.user.get_insertion_snippet(name),
+            ),
+            destination,
         )
+        actions.user.private_cursorless_command_and_wait(action)
 
     def private_cursorless_wrap_with_community_snippet(
         name: str,  # pyright: ignore [reportGeneralTypeIssues]
         target: CursorlessTarget,
     ):
         """Cursorless: Wrap target with community snippet <name>"""
-        wrap_with_community_snippet(
-            name,
+        action = WrapperSnippetAction(
+            get_wrapper_snippet(name),
             target,
-            use_list=False,
         )
+        actions.user.private_cursorless_command_and_wait(action)

cursorless-talon/src/snippets/snippets_get.py

@@ -1,8 +1,6 @@
 from talon import actions
 
 from .snippet_types import (
-    CommunityInsertionSnippet,
-    CommunityWrapperSnippet,
     CustomInsertionSnippet,
     CustomWrapperSnippet,
     ListInsertionSnippet,
@@ -12,53 +10,42 @@
 
 def get_insertion_snippet(
     name: str,
-    substitutions: dict[str, str] | None,
+    substitutions: dict[str, str] | None = None
+) -> CustomInsertionSnippet:
+    return CustomInsertionSnippet.create(
+        actions.user.get_insertion_snippet(name),
+        substitutions,
+    )
+
+def get_list_insertion_snippet(
+    name: str,
+    substitutions: dict[str, str] | None = None,
 ) -> ListInsertionSnippet | CustomInsertionSnippet:
     try:
-        return get_list_insertion_snippet(name, substitutions)
-    except Exception as ex:
-        if isinstance(ex, KeyError):
-            return get_custom_insertion_snippet(name, substitutions)
+        snippets = actions.user.get_list_insertion_snippet(name)
+    except Exception as e:
+        # Raised if the user has an older version of community
+        if isinstance(e, KeyError):
+            return get_insertion_snippet(name, substitutions)
         raise
 
-
-def get_list_insertion_snippet(
-    name: str,
-    substitutions: dict[str, str] | None,
-) -> ListInsertionSnippet:
-    snippets: list[CommunityInsertionSnippet] = actions.user.get_insertion_snippets(
-        name
-    )
     return ListInsertionSnippet(
         substitutions,
-        [CustomInsertionSnippet.create(s, substitutions=None) for s in snippets],
+        [CustomInsertionSnippet.create(s) for s in snippets],
     )
 
+def get_wrapper_snippet(name: str) -> CustomWrapperSnippet:
+    return CustomWrapperSnippet.create(actions.user.get_wrapper_snippet(name))
 
-def get_custom_insertion_snippet(
-    name: str,
-    substitutions: dict[str, str] | None,
-) -> CustomInsertionSnippet:
-    snippet: CommunityInsertionSnippet = actions.user.get_insertion_snippet(name)
-    return CustomInsertionSnippet.create(snippet, substitutions)
-
-
-def get_wrapper_snippet(name: str) -> ListWrapperSnippet | CustomWrapperSnippet:
+def get_list_wrapper_snippet(name: str) -> ListWrapperSnippet | CustomWrapperSnippet:
     try:
-        return get_list_wrapper_snippet(name)
-    except Exception as ex:
-        if isinstance(ex, KeyError):
-            return get_custom_wrapper_snippet(name)
+        snippets = actions.user.get_wrapper_snippets(name)
+    except Exception as e:
+        # Raised if the user has an older version of community
+        if isinstance(e, KeyError):
+            return get_wrapper_snippet(name)
         raise
 
-
-def get_list_wrapper_snippet(name: str) -> ListWrapperSnippet:
-    snippets: list[CommunityWrapperSnippet] = actions.user.get_wrapper_snippets(name)
     return ListWrapperSnippet(
         [CustomWrapperSnippet.create(s) for s in snippets],
     )
-
-
-def get_custom_wrapper_snippet(name: str) -> CustomWrapperSnippet:
-    snippet: CommunityWrapperSnippet = actions.user.get_wrapper_snippet(name)
-    return CustomWrapperSnippet.create(snippet)