Migrate block comment commands to actions

core/snippets/snippets_insert.py

@@ -70,6 +70,12 @@ def compute_snippet_body_with_substitutions(
     snippet: Snippet, substitutions: dict[str, str]
 ) -> str:
     body = snippet.body
+    return compute_snippet_body_with_substitutions_from_body(body, substitutions)
+
+
+def compute_snippet_body_with_substitutions_from_body(
+    body: str, substitutions: dict[str, str]
+) -> str:
     if substitutions:
         for k, v in substitutions.items():
             v = v.replace("$", r"\$")

lang/tags/comment_block.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from talon import Context, Module, actions
 
 c_like_ctx = Context()
@@ -14,22 +16,54 @@
 
 @mod.action_class
 class Actions:
-    def code_comment_block():
+    def code_comment_block(text: Optional[str] = None):
         """Block comment"""
-        actions.user.insert_snippet_by_name("commentBlock")
+        substitutions = None
+        if text is not None:
+            substitutions = {"0": text}
+        actions.user.insert_snippet_by_name("commentBlock", substitutions)
 
     def code_comment_block_prefix():
         """Block comment start syntax"""
 
     def code_comment_block_suffix():
         """Block comment end syntax"""
 
+    def code_comment_block_line():
+        """Wraps current line in block comment markers"""
+        actions.edit.line_start()
+        actions.user.code_comment_block_prefix()
+        actions.key("space")
+        actions.edit.line_end()
+        actions.key("space")
+        actions.user.code_comment_block_suffix()
+
+    def code_comment_block_at_line_start(text: str):
+        """Inserts a block comment at the start of the line"""
+        actions.edit.line_start()
+        actions.user.code_block_comment_inline(text)
+
+    def code_comment_block_at_line_end(text: str):
+        """Inserts a block comment at the end of the line"""
+        actions.edit.line_end()
+        actions.user.code_block_comment_inline(text)
+
+    def code_block_comment_inline(text: str):
+        """Inserts an inline block comment at the end of the line with the specified text"""
+        actions.user.code_comment_block_prefix()
+        actions.key("space")
+        actions.insert(text)
+        actions.key("space")
+        actions.user.code_comment_block_suffix()
+
 
 @c_like_ctx.action_class("user")
 class CActions:
-    def code_comment_block():
+    def code_comment_block(text: Optional[str] = None):
         actions.insert("/*\n\n*/")
         actions.edit.up()
+        if text is not None:
+            actions.insert(text)
 
     def code_comment_block_prefix():
         actions.insert("/*")

lang/tags/comment_block.talon

@@ -2,37 +2,13 @@ tag: user.code_comment_block
 -
 
 block comment: user.code_comment_block()
-block comment line:
-    edit.line_start()
-    user.code_comment_block_prefix()
-    key(space)
-    edit.line_end()
-    key(space)
-    user.code_comment_block_suffix()
+block comment line: user.code_comment_block_line()
 #adds comment to the start of the line
-block comment line <user.text> over:
-    edit.line_start()
-    user.code_comment_block()
-    insert(user.text)
-block comment <user.text> over:
-    user.code_comment_block()
-    insert(user.text)
-block comment <user.text>$:
-    user.code_comment_block()
-    insert(user.text)
+block comment line <user.text> over: user.code_comment_block_at_line_start(text)
+block comment <user.text> over: user.code_comment_block(text)
+block comment <user.text>$: user.code_comment_block(text)
 (line | inline) block comment <user.text> over:
-    edit.line_end()
-    user.code_comment_block_prefix()
-    key(space)
-    insert(user.text)
-    key(space)
-    user.code_comment_block_suffix()
-(line | inline) block comment <user.text>$:
-    edit.line_end()
-    user.code_comment_block_prefix()
-    key(space)
-    insert(user.text)
-    key(space)
-    user.code_comment_block_suffix()
+    user.code_comment_block_at_line_end(text)
+(line | inline) block comment <user.text>$: user.code_comment_block_at_line_end(text)
 open block comment: user.code_comment_block_prefix()
 close block comment: user.code_comment_block_suffix()