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

Make changes requested by @aeisenberg

Browse Source 
Co-authored by: Marc Jaramillo mnj.webdeveloper@gmail.com
Co-authored by: Musab Guma'a mgsium@github.com
This commit is contained in:
marcnjaramillo
2021-10-18 18:38:25 -07:00
parent b22a8692c8
commit 7d8e63c1d1
1 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
extensions/ql-vscode/src/databases-ui.ts
View File

@@ -452,45 +452,26 @@ export class DatabaseUI extends DisposableObject {
progress: ProgressCallback,
token: CancellationToken
): Promise<DatabaseItem | undefined> => {
if (this.queryServer && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
return await promptImportInternetDatabase(
this.databaseManager,
this.storagePath,
progress,
token,
this.queryServer.cliServer
);
} else {
return await promptImportInternetDatabase(
this.databaseManager,
this.storagePath,
progress,
token
);
}
return await promptImportInternetDatabase(
this.databaseManager,
this.storagePath,
progress,
token,
this.queryServer?.cliServer
);
};
handleChooseDatabaseLgtm = async (
progress: ProgressCallback,
token: CancellationToken
): Promise<DatabaseItem | undefined> => {
if (this.queryServer && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
return await promptImportLgtmDatabase(
this.databaseManager,
this.storagePath,
progress,
token,
this.queryServer.cliServer
);
} else {
return await promptImportLgtmDatabase(
this.databaseManager,
this.storagePath,
progress,
token
);
}
return await promptImportLgtmDatabase(
this.databaseManager,
this.storagePath,
progress,
token,
this.queryServer?.cliServer
);
};
async tryUpgradeCurrentDatabase(
@@ -591,10 +572,6 @@ export class DatabaseUI extends DisposableObject {
token: CancellationToken,
uri: Uri,
): Promise<void> => {
if (!this.queryServer) {
throw new Error('Query server not started');
}
try {
// Assume user has selected an archive if the file has a .zip extension
if (uri.path.endsWith('.zip')) {
@@ -604,7 +581,7 @@ export class DatabaseUI extends DisposableObject {
this.storagePath,
progress,
token,
this.queryServer.cliServer
this.queryServer?.cliServer
);
} else {
await this.setCurrentDatabase(progress, token, uri);
@@ -719,10 +696,6 @@ export class DatabaseUI extends DisposableObject {
progress: ProgressCallback,
token: CancellationToken,
): Promise<DatabaseItem | undefined> {
if (!this.queryServer) {
throw new Error('Query server not started');
}
const uri = await chooseDatabaseDir(byFolder);
if (!uri) {
return undefined;
@@ -741,7 +714,7 @@ export class DatabaseUI extends DisposableObject {
this.storagePath,
progress,
token,
this.queryServer.cliServer
this.queryServer?.cliServer
);
}
}