Skip to content

Commit 1601c44

Browse files
Add entry to changelog and resolve conflict in cli.ts
1 parent 0dea2ac commit 1601c44

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

extensions/ql-vscode/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [UNRELEASED]
44

5+
- Fix a bug that prevents results from large SARIF files (>4GB) from being rendered in the view. [#1004](https://github.com/github/vscode-codeql/pull/1004)
6+
- Fix the _CodeQL: Open Referenced File_ command for Windows systems. [#979](https://github.com/github/vscode-codeql/pull/979)
57
- Fix a bug that shows 'Set current database' when hovering over the currently selected database in the databases view. [#976](https://github.com/github/vscode-codeql/pull/976)
68
- Fix a bug with importing large databases. Databases over 4GB can now be imported directly from LGTM or from a zip file. This functionality is only available when using CodeQL CLI version 2.6.0 or later. [#971](https://github.com/github/vscode-codeql/pull/971)
79
- Replace certain control codes (`U+0000` - `U+001F`) with their corresponding control labels (`U+2400` - `U+241F`) in the results view. [#963](https://github.com/github/vscode-codeql/pull/963)

extensions/ql-vscode/src/cli.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,16 @@ export class CliVersionConstraint {
11211121
*/
11221122
public static CLI_VERSION_WITH_DB_REGISTRATION = new SemVer('2.4.1');
11231123

1124+
/**
1125+
* CLI version where the `--no-precompile` option for pack creation was introduced.
1126+
*/
1127+
public static CLI_VERSION_WITH_NO_PRECOMPILE = new SemVer('2.7.1');
1128+
1129+
/**
1130+
* CLI version where remote queries are supported.
1131+
*/
1132+
public static CLI_VERSION_REMOTE_QUERIES = new SemVer('2.6.3');
1133+
11241134
/**
11251135
* CLI version where the `--allow-library-packs` option to `codeql resolve queries` was
11261136
* introduced.
@@ -1168,4 +1178,12 @@ export class CliVersionConstraint {
11681178
return this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_WITH_DATABASE_UNBUNDLE);
11691179
}
11701180

1181+
async supportsNoPrecompile() {
1182+
return this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_WITH_NO_PRECOMPILE);
1183+
}
1184+
1185+
async supportsRemoteQueries() {
1186+
return this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_REMOTE_QUERIES);
1187+
}
1188+
11711189
}

0 commit comments

Comments
 (0)