Skip to content

Commit e4ff8d1

Browse files
committed
Only focus database panel on successful download
1 parent 0d2b44c commit e4ff8d1

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

extensions/ql-vscode/src/databaseFetcher.ts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ export async function promptImportInternetDatabase(
5454
progress
5555
))
5656
);
57-
commands.executeCommand('codeQLDatabases.focus');
58-
}
59-
if (item) {
60-
showAndLogInformationMessage(
61-
'Database downloaded and imported successfully.'
62-
);
57+
if (item) {
58+
commands.executeCommand('codeQLDatabases.focus');
59+
showAndLogInformationMessage('Database downloaded and imported successfully.');
60+
}
6361
}
6462
} catch (e) {
6563
showAndLogErrorMessage(e.message);
@@ -108,16 +106,14 @@ export async function promptImportLgtmDatabase(
108106
progress
109107
))
110108
);
111-
commands.executeCommand('codeQLDatabases.focus');
109+
if (item) {
110+
commands.executeCommand('codeQLDatabases.focus');
111+
showAndLogInformationMessage('Database downloaded and imported successfully.');
112+
}
112113
}
113114
} else {
114115
throw new Error(`Invalid LGTM URL: ${lgtmUrl}`);
115116
}
116-
if (item) {
117-
showAndLogInformationMessage(
118-
'Database downloaded and imported successfully.'
119-
);
120-
}
121117
} catch (e) {
122118
showAndLogErrorMessage(e.message);
123119
}
@@ -154,12 +150,9 @@ export async function importArchiveDatabase(
154150
progress
155151
))
156152
);
157-
commands.executeCommand('codeQLDatabases.focus');
158-
159153
if (item) {
160-
showAndLogInformationMessage(
161-
'Database unzipped and imported successfully.'
162-
);
154+
commands.executeCommand('codeQLDatabases.focus');
155+
showAndLogInformationMessage('Database unzipped and imported successfully.');
163156
}
164157
} catch (e) {
165158
if (e.message.includes('unexpected end of file')) {

0 commit comments

Comments
 (0)