mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove CLI_VERSION_WITH_STRUCTURED_EVAL_LOG constraint

Browse Source
This commit is contained in:
Charis Kyriakou
2023-07-21 15:37:56 +00:00
parent 3064415068
commit 0f594704d5
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/ql-vscode/src/codeql-cli/cli.ts
View File

@@ -1803,12 +1803,6 @@ export class CliVersionConstraint {
*/
public static CLI_VERSION_WITH_RESOLVE_EXTENSIONS = new SemVer("2.10.2");
/**
* CLI version where the `--evaluator-log` and related options to the query server were introduced,
* on a per-query server basis.
*/
public static CLI_VERSION_WITH_STRUCTURED_EVAL_LOG = new SemVer("2.8.2");
/**
* CLI version that supports rotating structured logs to produce one per query.
*
@@ -1885,12 +1879,6 @@ export class CliVersionConstraint {
);
}
async supportsStructuredEvalLog() {
return this.isVersionAtLeast(
CliVersionConstraint.CLI_VERSION_WITH_STRUCTURED_EVAL_LOG,
);
}
async supportsPerQueryEvalLog() {
return this.isVersionAtLeast(
CliVersionConstraint.CLI_VERSION_WITH_PER_QUERY_EVAL_LOG,

10
extensions/ql-vscode/src/query-server/legacy/query-server-client.ts
View File

@@ -150,13 +150,11 @@ export class QueryServerClient extends DisposableObject {
args.push("--old-eval-stats");
}
if (await this.cliServer.cliConstraints.supportsStructuredEvalLog()) {
const structuredLogFile = `${this.opts.contextStoragePath}/structured-evaluator-log.json`;
await ensureFile(structuredLogFile);
const structuredLogFile = `${this.opts.contextStoragePath}/structured-evaluator-log.json`;
await ensureFile(structuredLogFile);
args.push("--evaluator-log");
args.push(structuredLogFile);
}
args.push("--evaluator-log");
args.push(structuredLogFile);
if (this.config.debug) {
args.push("--debug", "--tuple-counting");