Move vscode-common's TestHelpers interface to its own file.

packages/vscode-common/src/TestHelpers.ts

@@ -0,0 +1,54 @@
+import type {
+  CommandServerApi,
+  ExcludableSnapshotField,
+  ExtraSnapshotField,
+  HatTokenMap,
+  IDE,
+  NormalizedIDE,
+  ScopeProvider,
+  SerializedMarks, TargetPlainObject,
+  TestCaseSnapshot,
+  TextEditor
+} from "@cursorless/common";
+import * as vscode from "vscode";
+import {VscodeApi} from "./VscodeApi";
+
+
+export interface TestHelpers {
+  ide: NormalizedIDE;
+  injectIde: (ide: IDE) => void;
+
+  scopeProvider: ScopeProvider;
+
+  hatTokenMap: HatTokenMap;
+
+  commandServerApi: CommandServerApi;
+
+  toVscodeEditor(editor: TextEditor): vscode.TextEditor;
+
+  setStoredTarget(
+    editor: vscode.TextEditor,
+    key: string,
+    targets: TargetPlainObject[] | undefined
+  ): void;
+
+  // FIXME: Remove this once we have a better way to get this function
+  // accessible from our tests
+  takeSnapshot(
+    excludeFields: ExcludableSnapshotField[],
+    extraFields: ExtraSnapshotField[],
+    editor: TextEditor,
+    ide: IDE,
+    marks: SerializedMarks | undefined,
+    forceRealClipboard: boolean
+  ): Promise<TestCaseSnapshot>;
+
+  runIntegrationTests(): Promise<void>;
+
+  cursorlessTalonStateJsonPath: string;
+
+  /**
+   * A thin wrapper around the VSCode API that allows us to mock it for testing.
+   */
+  vscodeApi: VscodeApi;
+}

packages/vscode-common/src/getExtensionApi.ts

@@ -1,59 +1,10 @@
 import type {
   CommandServerApi,
-  ExcludableSnapshotField,
-  ExtraSnapshotField,
-  HatTokenMap,
-  IDE,
-  NormalizedIDE,
-  ScopeProvider,
-  SerializedMarks,
   SnippetMap,
-  TargetPlainObject,
-  TestCaseSnapshot,
-  TextEditor,
 } from "@cursorless/common";
 import * as vscode from "vscode";
 import type { Language, SyntaxNode, Tree } from "web-tree-sitter";
-import { VscodeApi } from "./VscodeApi";
-
-export interface TestHelpers {
-  ide: NormalizedIDE;
-  injectIde: (ide: IDE) => void;
-
-  scopeProvider: ScopeProvider;
-
-  hatTokenMap: HatTokenMap;
-
-  commandServerApi: CommandServerApi;
-
-  toVscodeEditor(editor: TextEditor): vscode.TextEditor;
-
-  setStoredTarget(
-    editor: vscode.TextEditor,
-    key: string,
-    targets: TargetPlainObject[] | undefined,
-  ): void;
-
-  // FIXME: Remove this once we have a better way to get this function
-  // accessible from our tests
-  takeSnapshot(
-    excludeFields: ExcludableSnapshotField[],
-    extraFields: ExtraSnapshotField[],
-    editor: TextEditor,
-    ide: IDE,
-    marks: SerializedMarks | undefined,
-    forceRealClipboard: boolean,
-  ): Promise<TestCaseSnapshot>;
-
-  runIntegrationTests(): Promise<void>;
-
-  cursorlessTalonStateJsonPath: string;
-
-  /**
-   * A thin wrapper around the VSCode API that allows us to mock it for testing.
-   */
-  vscodeApi: VscodeApi;
-}
+import {TestHelpers} from "./TestHelpers";
 
 export interface CursorlessApi {
   testHelpers: TestHelpers | undefined;

packages/vscode-common/src/index.ts

@@ -1,4 +1,5 @@
 export * from "./getExtensionApi";
+export * from "./TestHelpers";
 export * from "./notebook";
 export * from "./testUtil/openNewEditor";
 export * from "./vscodeUtil";