Don't show empty list of DBs

github · Aug 4, 2021 · 2bfcd11 · 2bfcd11
1 parent 5932bdb
commit 2bfcd11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -571,6 +571,10 @@ async function activateWithInstalledDistribution(
         uri: Uri | undefined
       ) => {
         let filteredDBs = dbm.databaseItems;
+        if (filteredDBs.length === 0) {
+          void helpers.showAndLogErrorMessage('No databases found. Please add a suitable database to your workspace.');
+          return;
+        }
         // If possible, only show databases with the right language (otherwise show all databases).
         const queryLanguage = await findLanguage(cliServer, uri);
         if (queryLanguage) {

diff --git a/extensions/ql-vscode/src/run-remote-query.ts b/extensions/ql-vscode/src/run-remote-query.ts
@@ -71,7 +71,7 @@ export async function runRemoteQuery(cliServer: cli.CodeQLCliServer, credentials
   const repositories = config.repositories;
 
   if (!language) {
-    return;
+    return; // No error message needed, since `findlanguage` already displays one.
   }
 
   try {
-Original file line number
+Diff line change
@@ Expand Up @@
       const repositories = config.repositories;
       if (!language) {
-        return;
+        return; // No error message needed, since `findlanguage` already displays one.
       }
       try {
@@ Expand Down @@