test-clipboard-cleanup (#2368)

## Checklist

- [ ] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [ ] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [ ] I have not broken the cheatsheet

This should also deprecate having to solve
#559

---------

Co-authored-by: Cedric Halbronn <[email protected]>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

packages/common/src/ide/normalized/NormalizedIDE.ts

@@ -1,7 +1,6 @@
 import { getFixturePath } from "../../index";
 import { GeneralizedRange } from "../../types/GeneralizedRange";
 import { TextEditor } from "../../types/TextEditor";
-import FakeClipboard from "../fake/FakeClipboard";
 import FakeConfiguration from "../fake/FakeConfiguration";
 import FakeGlobalState from "../fake/FakeGlobalState";
 import FakeIDE from "../fake/FakeIDE";
@@ -13,7 +12,6 @@ import { QuickPickOptions } from "../types/QuickPickOptions";
 export class NormalizedIDE extends PassthroughIDEBase {
   configuration: FakeConfiguration;
   globalState: FakeGlobalState;
-  clipboard: FakeClipboard;
 
   constructor(
     original: IDE,
@@ -25,8 +23,6 @@ export class NormalizedIDE extends PassthroughIDEBase {
     this.messages = isSilent ? fakeIde.messages : original.messages;
     this.configuration = fakeIde.configuration;
     this.globalState = fakeIde.globalState;
-    this.clipboard = fakeIde.clipboard;
-
     this.initializeConfiguration();
   }
 

packages/cursorless-engine/src/testUtil/takeSnapshot.ts

@@ -1,5 +1,4 @@
 import {
-  Clipboard,
   ExcludableSnapshotField,
   ExtraContext,
   ExtraSnapshotField,
@@ -23,7 +22,6 @@ export async function takeSnapshot(
   marks?: SerializedMarks,
   extraContext?: ExtraContext,
   metadata?: unknown,
-  clipboard?: Clipboard,
 ) {
   const snapshot: TestCaseSnapshot = {
     documentContents: editor.document.getText(),
@@ -39,7 +37,7 @@ export async function takeSnapshot(
   }
 
   if (!excludeFields.includes("clipboard")) {
-    snapshot.clipboard = await (clipboard ?? ide.clipboard).readText();
+    snapshot.clipboard = await ide.clipboard.readText();
   }
 
   if (!excludeFields.includes("visibleRanges")) {

packages/cursorless-vscode-e2e/src/suite/recorded.vscode.test.ts

@@ -99,9 +99,7 @@ async function runTest(file: string, spyIde: SpyIDE) {
   }
 
   if (fixture.initialState.clipboard) {
-    vscode.env.clipboard.writeText(fixture.initialState.clipboard);
-    // FIXME https://github.com/cursorless-dev/cursorless/issues/559
-    // spyIde.clipboard.writeText(fixture.initialState.clipboard);
+    spyIde.clipboard.writeText(fixture.initialState.clipboard);
   }
 
   commandServerApi.setFocusedElementType(fixture.focusedElementType);
@@ -188,8 +186,6 @@ async function runTest(file: string, spyIde: SpyIDE) {
     spyIde.activeTextEditor!,
     spyIde,
     marks,
-    // FIXME: Stop overriding the clipboard once we have #559
-    true,
   );
 
   const rawSpyIdeValues = spyIde.getSpyValues(fixture.ide?.flashes != null);

packages/cursorless-vscode/src/constructTestHelpers.ts

@@ -51,7 +51,6 @@ export function constructTestHelpers(
       editor: TextEditor,
       ide: IDE,
       marks: SerializedMarks | undefined,
-      forceRealClipboard: boolean,
     ): Promise<TestCaseSnapshot> {
       return takeSnapshot(
         storedTargets,
@@ -62,7 +61,6 @@ export function constructTestHelpers(
         marks,
         undefined,
         undefined,
-        forceRealClipboard ? vscodeIDE.clipboard : undefined,
       );
     },
 

packages/vscode-common/src/TestHelpers.ts

@@ -40,7 +40,6 @@ export interface TestHelpers {
     editor: TextEditor,
     ide: IDE,
     marks: SerializedMarks | undefined,
-    forceRealClipboard: boolean,
   ): Promise<TestCaseSnapshot>;
 
   runIntegrationTests(): Promise<void>;