Debug session with Andrew and Musab

Co-authored by: Marc Jaramillo mnj.webdeveloper@gmail.com
Co-authored by: Musab Guma'a mgsium@github.com:

Author: marcnjaramillo

extensions/ql-vscode/src/databaseFetcher.ts

@@ -268,7 +268,7 @@ async function readAndUnzip(
     step: 9,
     message: `Unzipping into ${path.basename(unzipPath)}`
   });
-  if (cli !== undefined && await cli.cliConstraints.supportsDatabaseUnbundle()) {
+  if (cli && await cli.cliConstraints.supportsDatabaseUnbundle()) {
     // Use the `database unbundle` command if the installed cli version supports it
     await cli.databaseUnbundle(zipFile, unzipPath);
   } else {
@@ -312,9 +312,9 @@ async function fetchAndUnzip(
       .on('finish', resolve)
       .on('error', reject)
   );
-  if (cli && await cli.cliConstraints.supportsDatabaseUnbundle()) {
-    await readAndUnzip(Uri.file(archivePath).toString(true), unzipPath, cli, progress);
-  }
+
+  await readAndUnzip(Uri.file(archivePath).toString(true), unzipPath, cli, progress);
+
 
   // remove archivePath eagerly since these archives can be large.
   await fs.remove(archivePath);

extensions/ql-vscode/src/databases-ui.ts

@@ -452,7 +452,7 @@ export class DatabaseUI extends DisposableObject {
     progress: ProgressCallback,
     token: CancellationToken
   ): Promise<DatabaseItem | undefined> => {
-    if (this.queryServer !== undefined && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
+    if (this.queryServer && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
       return await promptImportInternetDatabase(
         this.databaseManager,
         this.storagePath,
@@ -475,7 +475,7 @@ export class DatabaseUI extends DisposableObject {
     token: CancellationToken
   ): Promise<DatabaseItem | undefined> => {
 
-    if (this.queryServer !== undefined && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
+    if (this.queryServer && await this.queryServer.cliServer.cliConstraints.supportsDatabaseUnbundle()) {
       return await promptImportLgtmDatabase(
         this.databaseManager,
         this.storagePath,