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

Move version check next to existing check

Browse Source
This commit is contained in:
Robert
2023-07-14 14:20:58 +01:00
parent 12511922ad
commit 1dcd048268
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-module.ts
View File

@@ -54,16 +54,6 @@ export class DataExtensionsEditorModule {
public getCommands(): DataExtensionsEditorCommands { public getCommands(): DataExtensionsEditorCommands {
return { return {
"codeQL.openDataExtensionsEditor": async () => { "codeQL.openDataExtensionsEditor": async () => {
if (
!(await this.cliServer.cliConstraints.supportsResolveExtensions())
) {
void showAndLogErrorMessage(
this.app.logger,
"CodeQL CLI version v2.10.2 or later is required to use the data extensions editor.",
);
return;
}
const db = this.databaseManager.currentDatabaseItem; const db = this.databaseManager.currentDatabaseItem;
if (!db) { if (!db) {
void showAndLogErrorMessage(this.app.logger, "No database selected"); void showAndLogErrorMessage(this.app.logger, "No database selected");
@@ -88,6 +78,16 @@ export class DataExtensionsEditorModule {
return; return;
} }
if (
!(await this.cliServer.cliConstraints.supportsResolveExtensions())
) {
void showAndLogErrorMessage(
this.app.logger,
`This feature requires CodeQL CLI version ${CliVersionConstraint.CLI_VERSION_WITH_RESOLVE_EXTENSIONS.format()} or later.`,
);
return;
}
const modelFile = await pickExtensionPack( const modelFile = await pickExtensionPack(
this.cliServer, this.cliServer,
db, db,