diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index ffa933d409c..c920fe149c2 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -1790,8 +1790,7 @@ "when": "false" }, { - "command": "codeQL.trimCache", - "when": "codeql.supportsTrimCache" + "command": "codeQL.trimCache" } ], "editor/context": [ diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts index 9728b3150fc..9ccdd9362b7 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli.ts @@ -1755,14 +1755,6 @@ export class CodeQLCliServer implements Disposable { this._versionChangedListeners.forEach((listener) => listener(newVersionAndFeatures), ); - // this._version is only undefined upon config change, so we reset CLI-based context key only when necessary. - await this.app.commands.execute( - "setContext", - "codeql.supportsTrimCache", - newVersionAndFeatures.version.compare( - CliVersionConstraint.CLI_VERSION_WITH_TRIM_CACHE, - ) >= 0, - ); } catch (e) { this._versionChangedListeners.forEach((listener) => listener(undefined), @@ -1917,13 +1909,7 @@ function shouldDebugCliServer() { export class CliVersionConstraint { // The oldest version of the CLI that we support. This is used to determine // whether to show a warning about the CLI being too old on startup. - public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.14.6"); - - /** - * CLI version where the query server supports the `evaluation/trimCache` method - * with `codeql database cleanup --mode=trim` semantics. - */ - public static CLI_VERSION_WITH_TRIM_CACHE = new SemVer("2.15.1"); + public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("v2.15.5"); public static CLI_VERSION_WITHOUT_MRVA_EXTENSIBLE_PREDICATE_HACK = new SemVer( "2.16.1", diff --git a/extensions/ql-vscode/supported_cli_versions.json b/extensions/ql-vscode/supported_cli_versions.json index ae7406832cb..31666d596d4 100644 --- a/extensions/ql-vscode/supported_cli_versions.json +++ b/extensions/ql-vscode/supported_cli_versions.json @@ -3,6 +3,5 @@ "v2.17.6", "v2.16.6", "v2.15.5", - "v2.14.6", "nightly" ]