Fixes taken from #1281

Author: pokey

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

@@ -176,10 +176,8 @@ async function runTest(file: string, spyIde: SpyIDE) {
     spyIde.activeTextEditor!,
     spyIde,
     marks,
-    undefined,
-    undefined,
     // FIXME: Stop overriding the clipboard once we have #559
-    vscode.env.clipboard,
+    true,
   );
 
   const rawSpyIdeValues = spyIde.getSpyValues(fixture.ide?.flashes != null);

packages/cursorless-vscode/constructTestHelpers.ts

@@ -1,7 +1,6 @@
 import {
   CommandServerApi,
   ExcludableSnapshotField,
-  ExtraContext,
   ExtraSnapshotField,
   IDE,
   NormalizedIDE,
@@ -43,10 +42,8 @@ export function constructTestHelpers(
       extraFields: ExtraSnapshotField[],
       editor: TextEditor,
       ide: IDE,
-      marks?: SerializedMarks,
-      extraContext?: ExtraContext,
-      metadata?: unknown,
-      clipboard?: vscode.Clipboard,
+      marks: SerializedMarks | undefined,
+      forceRealClipboard: boolean,
     ): Promise<TestCaseSnapshot> {
       return takeSnapshot(
         thatMark,
@@ -56,9 +53,9 @@ export function constructTestHelpers(
         editor,
         ide,
         marks,
-        extraContext,
-        metadata,
-        clipboard,
+        undefined,
+        undefined,
+        forceRealClipboard ? vscodeIDE.clipboard : undefined,
       );
     },
 

packages/vscode-common/getExtensionApi.ts

@@ -1,7 +1,6 @@
 import type {
   CommandServerApi,
   ExcludableSnapshotField,
-  ExtraContext,
   ExtraSnapshotField,
   HatTokenMap,
   IDE,
@@ -41,10 +40,8 @@ export interface TestHelpers {
     extraFields: ExtraSnapshotField[],
     editor: TextEditor,
     ide: IDE,
-    marks?: SerializedMarks,
-    extraContext?: ExtraContext,
-    metadata?: unknown,
-    clipboard?: vscode.Clipboard,
+    marks: SerializedMarks | undefined,
+    forceRealClipboard: boolean,
   ): Promise<TestCaseSnapshot>;
 }