From fd2aab433607a375f5dc85b317630b0efbe4342a Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 6 May 2025 11:08:00 +0200 Subject: [PATCH 1/2] Run latest stable vscode version in CI tests --- packages/test-harness/src/launchVscodeAndRunTests.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/test-harness/src/launchVscodeAndRunTests.ts b/packages/test-harness/src/launchVscodeAndRunTests.ts index af46b61670..96442da550 100644 --- a/packages/test-harness/src/launchVscodeAndRunTests.ts +++ b/packages/test-harness/src/launchVscodeAndRunTests.ts @@ -35,10 +35,7 @@ export async function launchVscodeAndRunTests(extensionTestsPath: string) { // we don't have to update the branch protection rules every time we bump // the legacy VSCode version. - // NB: Because of a CI crashing issue the vscode version is pinned. - // https://github.com/cursorless-dev/cursorless/issues/2878 - - const vscodeVersion = useLegacyVscode ? "1.82.0" : "1.97.2"; + const vscodeVersion = useLegacyVscode ? "1.82.0" : "stable"; const vscodeExecutablePath = await downloadAndUnzipVSCode(vscodeVersion); const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath); From eecda33f26dc81d25424e96e6b523d630ab67db2 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 21 Jun 2025 12:27:37 +0200 Subject: [PATCH 2/2] Update vscode capabilities --- .../src/ide/vscode/VscodeCapabilities.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts index f1765e60e8..25aad37cce 100644 --- a/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts +++ b/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts @@ -1,8 +1,16 @@ import type { Capabilities, CommandCapabilityMap } from "@cursorless/common"; +import { nodeGetRunMode } from "@cursorless/node-common"; +import * as semver from "semver"; +import * as vscode from "vscode"; + +// FIXME: In newer versions of vscode the `editor.action.clipboardCopyAction` +// command appears to be disabled / sandboxed in test mode. +const supportsCopy = + nodeGetRunMode() !== "test" || semver.lt(vscode.version, "1.98.0"); const COMMAND_CAPABILITIES: CommandCapabilityMap = { + clipboardCopy: supportsCopy ? { acceptsLocation: false } : undefined, clipboardPaste: true, - clipboardCopy: { acceptsLocation: false }, toggleLineComment: { acceptsLocation: false }, indentLine: { acceptsLocation: false }, outdentLine: { acceptsLocation: false },