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

Catch and report error when selecting invalid database

Browse Source
This commit is contained in:
Andrew Eisenberg
2020-06-11 13:20:25 -07:00
parent bba2f0217b
commit 2baae8481a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -297,12 +297,17 @@ export class DatabaseUI extends DisposableObject {
}
private handleSetCurrentDatabase = async (uri: Uri): Promise<DatabaseItem | undefined> => {
// Assume user has selected an archive if the file has a .zip extension
if (uri.path.endsWith('.zip')) {
return await importArchiveDatabase(uri.toString(true), this.databaseManager, this.storagePath);
}
try {
// Assume user has selected an archive if the file has a .zip extension
if (uri.path.endsWith('.zip')) {
return await importArchiveDatabase(uri.toString(true), this.databaseManager, this.storagePath);
}
return await this.setCurrentDatabase(uri);
return await this.setCurrentDatabase(uri);
} catch (e) {
showAndLogErrorMessage(`Could not set database to ${path.basename(uri.fsPath)}. Reason: ${e.message}`);
return undefined;
}
}
private handleRemoveDatabase = (databaseItem: DatabaseItem): void => {