Merge pull request #511 from ceh-forks/ceh-skip-log

Suppress database downloaded message when action canceled

Author: jcreedcmu

extensions/ql-vscode/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fix error with choosing qlpack search path.
 - Add the AST Viewer to inspect the QL AST of a source file in a database. Currently, only available for C/C++ sources.
 - Fix pagination when there are no results.
+- Suppress database downloaded from URL message when action canceled.
 
 ## 1.3.1 - 7 July 2020
 

extensions/ql-vscode/src/databaseFetcher.ts

@@ -54,11 +54,11 @@ export async function promptImportInternetDatabase(
             progress
           ))
       );
-      commands.executeCommand('codeQLDatabases.focus');
+      if (item) {
+        commands.executeCommand('codeQLDatabases.focus');
+        showAndLogInformationMessage('Database downloaded and imported successfully.');
+      }
     }
-    showAndLogInformationMessage(
-      'Database downloaded and imported successfully.'
-    );
   } catch (e) {
     showAndLogErrorMessage(e.message);
   }
@@ -106,16 +106,14 @@ export async function promptImportLgtmDatabase(
               progress
             ))
         );
-        commands.executeCommand('codeQLDatabases.focus');
+        if (item) {
+          commands.executeCommand('codeQLDatabases.focus');
+          showAndLogInformationMessage('Database downloaded and imported successfully.');
+        }
       }
     } else {
       throw new Error(`Invalid LGTM URL: ${lgtmUrl}`);
     }
-    if (item) {
-      showAndLogInformationMessage(
-        'Database downloaded and imported successfully.'
-      );
-    }
   } catch (e) {
     showAndLogErrorMessage(e.message);
   }
@@ -152,12 +150,9 @@ export async function importArchiveDatabase(
           progress
         ))
     );
-    commands.executeCommand('codeQLDatabases.focus');
-
     if (item) {
-      showAndLogInformationMessage(
-        'Database unzipped and imported successfully.'
-      );
+      commands.executeCommand('codeQLDatabases.focus');
+      showAndLogInformationMessage('Database unzipped and imported successfully.');
     }
   } catch (e) {
     if (e.message.includes('unexpected end of file')) {