Cleanup

Author: AndreasArvidsson

packages/cursorless-engine/src/cursorlessEngine.ts

@@ -62,7 +62,6 @@ export async function createCursorlessEngine({
   talonSpokenForms = new DisabledTalonSpokenForms(),
   snippets = new DisabledSnippets(),
 }: EngineProps): Promise<CursorlessEngine> {
-  console.log("createCursorlessEngine");
   injectIde(ide);
 
   const debug = new Debug(ide);

packages/cursorless-engine/src/disabledComponents/DisabledTalonSpokenForms.ts

@@ -6,7 +6,6 @@ import {
 
 export class DisabledTalonSpokenForms implements TalonSpokenForms {
   getSpokenFormEntries(): Promise<SpokenFormEntry[]> {
-    console.log("getSpokenFormEntries() throw DisabledCustomSpokenFormsError");
     throw new DisabledCustomSpokenFormsError();
   }
 

packages/cursorless-engine/src/generateSpokenForm/CustomSpokenFormGeneratorImpl.ts

@@ -28,7 +28,6 @@ export class CustomSpokenFormGeneratorImpl
   public readonly customSpokenFormsInitialized: Promise<void>;
 
   constructor(talonSpokenForms: TalonSpokenForms) {
-    console.log("CustomSpokenFormGeneratorImpl constructor");
     this.customSpokenForms = new CustomSpokenForms(talonSpokenForms);
     this.customSpokenFormsInitialized =
       this.customSpokenForms.customSpokenFormsInitialized;
@@ -37,15 +36,11 @@ export class CustomSpokenFormGeneratorImpl
     );
     this.disposable = this.customSpokenForms.onDidChangeCustomSpokenForms(
       () => {
-        console.log(
-          "CustomSpokenFormGeneratorImpl.onDidChangeCustomSpokenForms",
-        );
         this.spokenFormGenerator = new SpokenFormGenerator(
           this.customSpokenForms.spokenFormMap,
         );
       },
     );
-    console.log("CustomSpokenFormGeneratorImpl constructor done");
   }
 
   onDidChangeCustomSpokenForms(listener: Listener<[]>) {

packages/cursorless-engine/src/spokenForms/CustomSpokenForms.ts

@@ -58,15 +58,11 @@ export class CustomSpokenForms {
   }
 
   constructor(private talonSpokenForms: TalonSpokenForms) {
-    console.log("CustomSpokenForms constructor");
-
     this.disposable = talonSpokenForms.onDidChange(() =>
       this.updateSpokenFormMaps(),
     );
 
     this.customSpokenFormsInitialized = this.updateSpokenFormMaps();
-
-    console.log("CustomSpokenForms constructor done");
   }
 
   /**
@@ -77,7 +73,6 @@ export class CustomSpokenForms {
   onDidChangeCustomSpokenForms = this.notifier.registerListener;
 
   private async updateSpokenFormMaps(): Promise<void> {
-    console.log("updateSpokenFormMaps()");
     let allCustomEntries: SpokenFormEntry[];
     try {
       allCustomEntries = await this.talonSpokenForms.getSpokenFormEntries();
@@ -89,7 +84,6 @@ export class CustomSpokenForms {
         // Handle case where spokenForms.json doesn't exist yet
         this.needsInitialTalonUpdate_ = true;
       } else if (err instanceof DisabledCustomSpokenFormsError) {
-        console.log("catch DisabledCustomSpokenFormsError");
         // Do nothing: this ide doesn't currently support custom spoken forms
       } else {
         console.error("Error loading custom spoken forms", err);
@@ -104,8 +98,6 @@ export class CustomSpokenForms {
       this.spokenFormMap_ = { ...defaultSpokenFormMap };
       this.notifier.notifyListeners();
 
-      console.log("return early");
-
       return;
     }
 

packages/cursorless-everywhere-talon-core/src/extension.ts

@@ -21,7 +21,6 @@ export async function activate(
   try {
     return await activateHelper(talon, runMode);
   } catch (error) {
-    console.log("Error activating talon.js");
     console.error(error);
     throw error;
   }

packages/cursorless-everywhere-talon-e2e/src/quickjsTest.ts

@@ -1,4 +1,4 @@
-// import type { ActionDescriptor, CommandLatest } from "@cursorless/common";
+import type { ActionDescriptor, CommandLatest } from "@cursorless/common";
 import { activate } from "@cursorless/cursorless-everywhere-talon-core";
 import * as std from "std";
 import talonMock from "./talonMock";
@@ -12,95 +12,95 @@ async function runTests() {
     console.log();
     console.log("Running quickjs tests");
 
-    // await test("testTake", testTake);
-    // await test("testChuck", testChuck);
+    await test("testTake", testTake);
+    await test("testChuck", testChuck);
   } catch (_error) {
     hasFailed = true;
   }
 
   std.exit(hasFailed ? 1 : 0);
 }
 
-// async function testTake() {
-//   const testHelpers = talonMock.getTestHelpers();
-//   const initialText = "Hello, world!";
-
-//   testHelpers.setEditorState({
-//     text: initialText,
-//     selections: [{ anchor: 0, active: 0 }],
-//   });
-
-//   await runAction({
-//     name: "setSelection",
-//     target: {
-//       type: "primitive",
-//       modifiers: [{ type: "containingScope", scopeType: { type: "token" } }],
-//     },
-//   });
-
-//   const { text, selections } = testHelpers.getFinalEditorState();
-
-//   assert.equal(text, initialText);
-//   assert.equal(selections.length, 1);
-//   assert.equal(selections[0].anchor, 0);
-//   assert.equal(selections[0].active, 5);
-// }
-
-// async function testChuck() {
-//   const testHelpers = talonMock.getTestHelpers();
-
-//   testHelpers.setEditorState({
-//     text: "Hello, world!",
-//     selections: [{ anchor: 0, active: 0 }],
-//   });
-
-//   await runAction({
-//     name: "remove",
-//     target: {
-//       type: "primitive",
-//       modifiers: [{ type: "containingScope", scopeType: { type: "token" } }],
-//     },
-//   });
-
-//   const { text, selections } = testHelpers.getFinalEditorState();
-
-//   assert.equal(text, ", world!");
-//   assert.equal(selections.length, 1);
-//   assert.equal(selections[0].anchor, 0);
-//   assert.equal(selections[0].active, 0);
-// }
-
-// function runAction(action: ActionDescriptor) {
-//   const command: CommandLatest = {
-//     version: 7,
-//     usePrePhraseSnapshot: false,
-//     action,
-//   };
-//   return talonMock
-//     .getTestHelpers()
-//     .contextActions.private_cursorless_talonjs_run_and_wait(
-//       "cursorless.command",
-//       command,
-//     );
-// }
-
-// const assert = {
-//   equal: (actual: unknown, expected: unknown) => {
-//     if (actual !== expected) {
-//       throw new Error(`Actual '${actual}' Expected '${expected}'`);
-//     }
-//   },
-// };
-
-// async function test(name: string, fn: () => Promise<void>) {
-//   try {
-//     await fn();
-//     console.log(`    * ${name}`);
-//   } catch (error) {
-//     console.error(`    x ${name}`);
-//     console.error(error);
-//     hasFailed = true;
-//   }
-// }
+async function testTake() {
+  const testHelpers = talonMock.getTestHelpers();
+  const initialText = "Hello, world!";
+
+  testHelpers.setEditorState({
+    text: initialText,
+    selections: [{ anchor: 0, active: 0 }],
+  });
+
+  await runAction({
+    name: "setSelection",
+    target: {
+      type: "primitive",
+      modifiers: [{ type: "containingScope", scopeType: { type: "token" } }],
+    },
+  });
+
+  const { text, selections } = testHelpers.getFinalEditorState();
+
+  assert.equal(text, initialText);
+  assert.equal(selections.length, 1);
+  assert.equal(selections[0].anchor, 0);
+  assert.equal(selections[0].active, 5);
+}
+
+async function testChuck() {
+  const testHelpers = talonMock.getTestHelpers();
+
+  testHelpers.setEditorState({
+    text: "Hello, world!",
+    selections: [{ anchor: 0, active: 0 }],
+  });
+
+  await runAction({
+    name: "remove",
+    target: {
+      type: "primitive",
+      modifiers: [{ type: "containingScope", scopeType: { type: "token" } }],
+    },
+  });
+
+  const { text, selections } = testHelpers.getFinalEditorState();
+
+  assert.equal(text, ", world!");
+  assert.equal(selections.length, 1);
+  assert.equal(selections[0].anchor, 0);
+  assert.equal(selections[0].active, 0);
+}
+
+function runAction(action: ActionDescriptor) {
+  const command: CommandLatest = {
+    version: 7,
+    usePrePhraseSnapshot: false,
+    action,
+  };
+  return talonMock
+    .getTestHelpers()
+    .contextActions.private_cursorless_talonjs_run_and_wait(
+      "cursorless.command",
+      command,
+    );
+}
+
+const assert = {
+  equal: (actual: unknown, expected: unknown) => {
+    if (actual !== expected) {
+      throw new Error(`Actual '${actual}' Expected '${expected}'`);
+    }
+  },
+};
+
+async function test(name: string, fn: () => Promise<void>) {
+  try {
+    await fn();
+    console.log(`    * ${name}`);
+  } catch (error) {
+    console.error(`    x ${name}`);
+    console.error(error);
+    hasFailed = true;
+  }
+}
 
 await runTests();