Move codeQL.chooseDatabaseFolder command

extensions/ql-vscode/src/common/commands.ts

@@ -64,6 +64,7 @@ export type QueryHistoryCommands = {
 // Commands used for the local databases panel
 export type LocalDatabasesCommands = {
   // Command palette commands
+  "codeQL.chooseDatabaseFolder": () => Promise<void>;
   "codeQL.upgradeCurrentDatabase": () => Promise<void>;
   "codeQL.clearCache": () => Promise<void>;
 

extensions/ql-vscode/src/extension.ts

@@ -1220,16 +1220,6 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  ctx.subscriptions.push(
-    commandRunnerWithProgress(
-      "codeQL.chooseDatabaseFolder",
-      (progress: ProgressCallback, token: CancellationToken) =>
-        databaseUI.chooseDatabaseFolder(progress, token),
-      {
-        title: "Choose a Database from a Folder",
-      },
-    ),
-  );
   ctx.subscriptions.push(
     commandRunnerWithProgress(
       "codeQL.chooseDatabaseArchive",

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

@@ -208,6 +208,8 @@ export class DatabaseUI extends DisposableObject {
 
   public getCommands(): LocalDatabasesCommands {
     return {
+      "codeQL.chooseDatabaseFolder":
+        this.handleChooseDatabaseFolderFromPalette.bind(this),
       "codeQL.setCurrentDatabase": this.handleSetCurrentDatabase.bind(this),
       "codeQL.setDefaultTourDatabase":
         this.handleSetDefaultTourDatabase.bind(this),
@@ -268,6 +270,17 @@ export class DatabaseUI extends DisposableObject {
     );
   }
 
+  private async handleChooseDatabaseFolderFromPalette(): Promise<void> {
+    return withProgress(
+      async (progress, token) => {
+        await this.chooseDatabaseFolder(progress, token);
+      },
+      {
+        title: "Choose a Database from a Folder",
+      },
+    );
+  }
+
   private async handleSetDefaultTourDatabase(): Promise<void> {
     return withProgress(
       async (progress, token) => {