Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/app-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "module",
"main": "./extension.cjs",
"engines": {
"vscode": "^1.98.0"
"vscode": "^1.107.0"
},
"extensionKind": [
"ui",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import semver from "semver";
import vscode from "vscode";
import type {
Capabilities,
CommandCapabilityMap,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/lib-neovim-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
},
"devDependencies": {
"@types/lodash-es": "^4.17.12",
"@types/vscode": "1.98.0"
"@types/vscode": "1.107.0"
}
}
2 changes: 1 addition & 1 deletion packages/lib-vscode-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"@cursorless/lib-common": "workspace:*"
},
"devDependencies": {
"@types/vscode": "1.98.0"
"@types/vscode": "1.107.0"
}
}
2 changes: 1 addition & 1 deletion packages/test-runner/src/launchVscodeAndRunTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions packages/test-vscode-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
16 changes: 1 addition & 15 deletions packages/test-vscode-e2e/src/suite/shouldSkipTest.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
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":
return true;
// No default
}

return isVersionProblematic && name.startsWith("recorded/languages/latex/");
}

export function shouldSkipScopeTest(languageId: string): boolean {
return isVersionProblematic && languageId === "latex";
return false;
}
31 changes: 13 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading