Fix file imports

Author: aeisenberg

extensions/ql-vscode/package-lock.json

@@ -8,10 +8,12 @@ import {
   showAndLogErrorMessage,
   showAndLogWarningMessage,
   showAndLogInformationMessage,
-  isLikelyDatabaseRoot,
+  isLikelyDatabaseRoot
+} from './helpers';
+import {
   ProgressCallback,
   withProgress
-} from './helpers';
+} from './commandRunner';
 import { zipArchiveScheme, encodeArchiveBasePath, decodeSourceArchiveUri, encodeSourceArchiveUri } from './archive-filesystem-provider';
 import { DisposableObject } from './vscode-utils/disposable-object';
 import { Logger, logger } from './logging';

extensions/ql-vscode/src/databases.ts

@@ -8,6 +8,7 @@ import {
   workspace,
 } from 'vscode';
 import { CodeQLCliServer } from './cli';
+import { ProgressCallback } from './commandRunner';
 import { logger } from './logging';
 
 /**

extensions/ql-vscode/src/helpers.ts

@@ -11,10 +11,8 @@ import {
   getInitialQueryContents,
   getPrimaryDbscheme,
   getQlPackForDbscheme,
-  ProgressCallback,
   showAndLogErrorMessage,
   showBinaryChoiceDialog,
-  UserCancellationException
 } from './helpers';
 
 const QUICK_QUERIES_DIR_NAME = 'quick-queries';

extensions/ql-vscode/src/quick-query.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { CodeQLExtensionInterface } from '../../extension';
 import { DatabaseManager } from '../../databases';
 import { promptImportLgtmDatabase, importArchiveDatabase, promptImportInternetDatabase } from '../../databaseFetcher';
-import { ProgressCallback } from '../../helpers';
+import { ProgressCallback } from '../../commandRunner';
 import { dbLoc, DB_URL, storagePath } from './global.helper';
 
 /**