diff --git a/packages/app-vscode/package.json b/packages/app-vscode/package.json index e9b2a547b9..9deb809d08 100644 --- a/packages/app-vscode/package.json +++ b/packages/app-vscode/package.json @@ -18,7 +18,7 @@ "type": "module", "main": "./extension.cjs", "engines": { - "vscode": "^1.98.0" + "vscode": "^1.107.0" }, "extensionKind": [ "ui", @@ -1289,7 +1289,7 @@ "@types/node": "^24.19.2", "@types/semver": "^7.8.0", "@types/sinon": "^22.0.0", - "@types/vscode": "1.98.0", + "@types/vscode": "1.107.0", "esbuild": "^0.28.2", "fast-xml-parser": "^5.11.2", "fs-extra": "^11.4.1", diff --git a/packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts b/packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts index 64f2056042..c01cb8edf1 100644 --- a/packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts +++ b/packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts @@ -1,5 +1,3 @@ -import semver from "semver"; -import vscode from "vscode"; import type { Capabilities, CommandCapabilityMap, @@ -8,8 +6,7 @@ import { nodeGetRunMode } from "@cursorless/lib-node-common"; // 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 supportsCopy = nodeGetRunMode() !== "test"; const COMMAND_CAPABILITIES: CommandCapabilityMap = { clipboardCopy: supportsCopy ? { acceptsLocation: false } : undefined, diff --git a/packages/lib-neovim-common/package.json b/packages/lib-neovim-common/package.json index 31fe82898a..d99f8b43b0 100644 --- a/packages/lib-neovim-common/package.json +++ b/packages/lib-neovim-common/package.json @@ -22,6 +22,6 @@ }, "devDependencies": { "@types/lodash-es": "^4.17.12", - "@types/vscode": "1.98.0" + "@types/vscode": "1.107.0" } } diff --git a/packages/lib-vscode-common/package.json b/packages/lib-vscode-common/package.json index 53dcbb2647..472a2e6f4c 100644 --- a/packages/lib-vscode-common/package.json +++ b/packages/lib-vscode-common/package.json @@ -15,6 +15,6 @@ "@cursorless/lib-common": "workspace:*" }, "devDependencies": { - "@types/vscode": "1.98.0" + "@types/vscode": "1.107.0" } } diff --git a/packages/test-runner/src/launchVscodeAndRunTests.ts b/packages/test-runner/src/launchVscodeAndRunTests.ts index a312ea240e..fb440123eb 100644 --- a/packages/test-runner/src/launchVscodeAndRunTests.ts +++ b/packages/test-runner/src/launchVscodeAndRunTests.ts @@ -36,7 +36,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. - const vscodeVersion = useLegacyVscode ? "1.98.0" : "stable"; + const vscodeVersion = useLegacyVscode ? "1.107.0" : "stable"; const vscodeExecutablePath = await downloadAndUnzipVSCode(vscodeVersion); const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath); diff --git a/packages/test-vscode-e2e/package.json b/packages/test-vscode-e2e/package.json index a93042de27..1db854471a 100644 --- a/packages/test-vscode-e2e/package.json +++ b/packages/test-vscode-e2e/package.json @@ -19,10 +19,8 @@ "devDependencies": { "@types/lodash-es": "^4.17.12", "@types/mocha": "^10.0.10", - "@types/semver": "^7.8.0", "@types/sinon": "^22.0.0", - "@types/vscode": "1.98.0", - "semver": "^7.8.5", + "@types/vscode": "1.107.0", "sinon": "^22.1.0" } } diff --git a/packages/test-vscode-e2e/src/suite/shouldSkipTest.ts b/packages/test-vscode-e2e/src/suite/shouldSkipTest.ts index c14dc2301e..bf0e22d76d 100644 --- a/packages/test-vscode-e2e/src/suite/shouldSkipTest.ts +++ b/packages/test-vscode-e2e/src/suite/shouldSkipTest.ts @@ -1,13 +1,3 @@ -import semver from "semver"; -import vscode from "vscode"; - -/** - * FIXME: On newer vscode versions some Tree sitter parser throws memory errors - * https://github.com/cursorless-dev/cursorless/issues/2879 - */ -const isVersionProblematic = - semver.lt(vscode.version, "1.107.0") && semver.gte(vscode.version, "1.98.0"); - export function shouldSkipRecordedTest(name: string): boolean { switch (name) { case "recorded/docs/actions/randomizeTargets": @@ -15,9 +5,5 @@ export function shouldSkipRecordedTest(name: string): boolean { // No default } - return isVersionProblematic && name.startsWith("recorded/languages/latex/"); -} - -export function shouldSkipScopeTest(languageId: string): boolean { - return isVersionProblematic && languageId === "latex"; + return false; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 135a0a5558..e1b9e7f50f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,8 +158,8 @@ importers: specifier: ^22.0.0 version: 22.0.0 '@types/vscode': - specifier: 1.98.0 - version: 1.98.0 + specifier: 1.107.0 + version: 1.107.0 esbuild: specifier: ^0.28.2 version: 0.28.2 @@ -486,8 +486,8 @@ importers: specifier: ^4.17.12 version: 4.17.12 '@types/vscode': - specifier: 1.98.0 - version: 1.98.0 + specifier: 1.107.0 + version: 1.107.0 packages/lib-neovim-registry: {} @@ -592,8 +592,8 @@ importers: version: link:../lib-common devDependencies: '@types/vscode': - specifier: 1.98.0 - version: 1.98.0 + specifier: 1.107.0 + version: 1.107.0 packages/lib-vscode-tutorial-webview: dependencies: @@ -740,18 +740,12 @@ importers: '@types/mocha': specifier: ^10.0.10 version: 10.0.10 - '@types/semver': - specifier: ^7.8.0 - version: 7.8.0 '@types/sinon': specifier: ^22.0.0 version: 22.0.0 '@types/vscode': - specifier: 1.98.0 - version: 1.98.0 - semver: - specifier: ^7.8.5 - version: 7.8.5 + specifier: 1.107.0 + version: 1.107.0 sinon: specifier: ^22.1.0 version: 22.1.0 @@ -4980,8 +4974,8 @@ packages: '@types/vscode-webview@1.57.5': resolution: {integrity: sha512-iBAUYNYkz+uk1kdsq05fEcoh8gJmwT3lqqFPN7MGyjQ3HVloViMdo7ZJ8DFIP8WOK74PjOEilosqAyxV2iUFUw==} - '@types/vscode@1.98.0': - resolution: {integrity: sha512-+KuiWhpbKBaG2egF+51KjbGWatTH5BbmWQjSLMDCssb4xF8FJnW4nGH4nuAdOOfMbpD0QlHtI+C3tPq+DoKElg==} + '@types/vscode@1.107.0': + resolution: {integrity: sha512-XS8YE1jlyTIowP64+HoN30OlC1H9xqSlq1eoLZUgFEC8oUTO6euYZxti1xRiLSfZocs4qytTzR6xCBYtioQTCg==} '@types/ws@8.18.2': resolution: {integrity: sha512-67MQl+fpWKVTT1NYdnmo3U4sc/xPo/zQBncVnI74qmQa0z/b+1g6iYqNmGCPbxO+zz2aklb08a0oHfegiVd0/w==} @@ -16227,7 +16221,7 @@ snapshots: '@types/cross-spawn@6.0.6': dependencies: - '@types/node': 26.6.5 + '@types/node': 24.19.2 '@types/debug@4.1.13': dependencies: @@ -16336,6 +16330,7 @@ snapshots: '@types/node@26.6.5': dependencies: undici-types: 8.9.0 + optional: true '@types/normalize-package-data@2.4.4': {} @@ -16423,7 +16418,7 @@ snapshots: '@types/vscode-webview@1.57.5': {} - '@types/vscode@1.98.0': {} + '@types/vscode@1.107.0': {} '@types/ws@8.18.2': dependencies: