More snippet cleanup

Author: AndreasArvidsson

cursorless-talon-dev/src/spoken_form_test.py

@@ -39,8 +39,6 @@
 
 mockedGetValue = ""
 
-community_snippets_tag_name = "user.cursorless_use_community_snippets"
-
 
 @ctx.action_class("user")
 class UserActions:
@@ -99,20 +97,6 @@ def private_cursorless_spoken_form_test_mode(enable: bool):  # pyright: ignore [
                 "Cursorless spoken form tests are done. Talon microphone is re-enabled."
             )
 
-    def private_cursorless_use_community_snippets(enable: bool):  # pyright: ignore [reportGeneralTypeIssues]
-        """Enable/disable cursorless community snippets in test mode"""
-        if enable:
-            tags = set(ctx.tags)
-            tags.add(community_snippets_tag_name)
-            ctx.tags = list(tags)
-        else:
-            tags = set(ctx.tags)
-            tags.remove(community_snippets_tag_name)
-            ctx.tags = list(tags)
-        # Note: Test harness hangs if we don't print anything because it's
-        # waiting for stdout
-        print(f"Set community snippet enablement to {enable}")
-
     def private_cursorless_spoken_form_test(
         phrase: str,  # pyright: ignore [reportGeneralTypeIssues]
         mockedGetValue_: Optional[str],

cursorless-talon/src/actions/generate_snippet.py

@@ -1,17 +1,12 @@
 import glob
 from pathlib import Path
 
-from talon import Context, Module, actions, registry, settings
+from talon import Module, actions, registry, settings
 
 from ..targets.target_types import CursorlessExplicitTarget
 
 mod = Module()
 
-ctx = Context()
-ctx.matches = r"""
-tag: user.cursorless_use_community_snippets
-"""
-
 
 @mod.action_class
 class Actions:
@@ -33,17 +28,6 @@ def private_cursorless_migrate_snippets():
 
     def private_cursorless_generate_snippet_action(target: CursorlessExplicitTarget):  # pyright: ignore [reportGeneralTypeIssues]
         """Generate a snippet from the given target"""
-        actions.user.private_cursorless_command_no_wait(
-            {
-                "name": "generateSnippet",
-                "target": target,
-            }
-        )
-
-
-@ctx.action_class("user")
-class UserActions:
-    def private_cursorless_generate_snippet_action(target: CursorlessExplicitTarget):  # pyright: ignore [reportGeneralTypeIssues]
         actions.user.private_cursorless_command_no_wait(
             {
                 "name": "generateSnippet",

packages/cursorless-engine/src/test/fixtures/communitySnippets.fixture.ts

@@ -27,7 +27,5 @@ const verticalRangeAction: ActionDescriptor = {
  * Talon tests by relying on our recorded test fixtures alone.
  */
 export const communitySnippetsSpokenFormsFixture = [
-  spokenFormTest("snippet code after air", verticalRangeAction, undefined, {
-    useCommunitySnippets: true,
-  }),
+  spokenFormTest("snippet code after air", verticalRangeAction, undefined),
 ];

packages/cursorless-engine/src/test/fixtures/spokenFormTest.ts

@@ -23,38 +23,29 @@ export interface SpokenFormTest {
    * {@link spokenForm} is spoken.
    */
   commands: CommandV6[];
-
-  /**
-   * If `true`, use community snippets instead of Cursorless snippets
-   */
-  useCommunitySnippets: boolean;
 }
 
 export function spokenFormTest(
   spokenForm: string,
   action: ActionDescriptor,
   mockedGetValue?: unknown,
-  { useCommunitySnippets = false }: SpokenFormTestOpts = {},
 ): SpokenFormTest {
   return {
     spokenForm,
     mockedGetValue: wrapMockedGetValue(mockedGetValue),
     commands: [command(spokenForm, action)],
-    useCommunitySnippets,
   };
 }
 
 export function multiActionSpokenFormTest(
   spokenForm: string,
   actions: ActionDescriptor[],
   mockedGetValue?: unknown,
-  { useCommunitySnippets = false }: SpokenFormTestOpts = {},
 ): SpokenFormTest {
   return {
     spokenForm,
     mockedGetValue: wrapMockedGetValue(mockedGetValue),
     commands: actions.map((action) => command(spokenForm, action)),
-    useCommunitySnippets,
   };
 }
 
@@ -72,7 +63,3 @@ function command(spokenForm: string, action: ActionDescriptor): CommandV6 {
     action,
   };
 }
-
-export interface SpokenFormTestOpts {
-  useCommunitySnippets?: boolean;
-}

packages/cursorless-engine/src/test/spokenForms.talon.test.ts

@@ -13,7 +13,6 @@ import { getHatMapCommand } from "../generateSpokenForm/getHatMapCommand";
 import { TalonRepl } from "../testUtil/TalonRepl";
 import { communitySnippetsSpokenFormsFixture } from "./fixtures/communitySnippets.fixture";
 import { multiActionFixture } from "./fixtures/multiAction.fixture";
-import type { SpokenFormTestOpts } from "./fixtures/spokenFormTest";
 import { synonymousSpokenFormsFixture } from "./fixtures/synonymousSpokenForms.fixture";
 import { talonApiFixture } from "./fixtures/talonApi.fixture";
 
@@ -45,12 +44,8 @@ suite("Talon spoken forms", async function () {
     ...talonApiFixture,
     ...multiActionFixture,
     ...communitySnippetsSpokenFormsFixture,
-  ].forEach(({ spokenForm, commands, mockedGetValue, useCommunitySnippets }) =>
-    test(spokenForm, () =>
-      runTest(repl, spokenForm, commands, mockedGetValue, {
-        useCommunitySnippets,
-      }),
-    ),
+  ].forEach(({ spokenForm, commands, mockedGetValue }) =>
+    test(spokenForm, () => runTest(repl, spokenForm, commands, mockedGetValue)),
   );
 });
 
@@ -83,7 +78,6 @@ async function runTest(
   spokenForm: string,
   commandsLegacy: Command[],
   mockedGetValue?: unknown,
-  { useCommunitySnippets = false }: SpokenFormTestOpts = {},
 ) {
   const commandsExpected = commandsLegacy.map((command) => ({
     ...canonicalizeAndValidateCommand(command),
@@ -109,37 +103,24 @@ async function runTest(
       ? "None"
       : JSON.stringify(JSON.stringify(mockedGetValue));
 
-  if (useCommunitySnippets) {
-    await repl.action(`user.private_cursorless_use_community_snippets(True)`);
-  }
+  const result = await repl.action(
+    `user.private_cursorless_spoken_form_test("${spokenForm}", ${mockedGetValueString})`,
+  );
 
-  try {
-    const result = await repl.action(
-      `user.private_cursorless_spoken_form_test("${spokenForm}", ${mockedGetValueString})`,
-    );
-
-    const commandsActual = (() => {
-      try {
-        return JSON.parse(result);
-      } catch (_e) {
-        throw Error(result);
-      }
-    })();
-
-    assert.deepStrictEqual(commandsActual, commandsExpected);
-  } finally {
-    if (useCommunitySnippets) {
-      await repl.action(
-        `user.private_cursorless_use_community_snippets(False)`,
-      );
+  const commandsActual = (() => {
+    try {
+      return JSON.parse(result);
+    } catch (_e) {
+      throw Error(result);
     }
-  }
+  })();
+
+  assert.deepStrictEqual(commandsActual, commandsExpected);
 }
 
 async function setTestMode(repl: TalonRepl, enabled: boolean) {
   const arg = enabled ? "True" : "False";
   await repl.action(`user.private_cursorless_spoken_form_test_mode(${arg})`);
-  await repl.action(`user.private_cursorless_use_community_snippets(False)`);
 
   // If you have warnings in your talon user files, they will be printed to the
   // repl when you run the above action. We need to eat them so that they don't