From 8b9003e84564c2a18aad41abf46008c88fb9a511 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Wed, 22 Mar 2023 16:42:34 +0000
Subject: [PATCH] Convert extensions/ql-vscode/src/local-databases.ts to call
 typed commands

---
 extensions/ql-vscode/src/extension.ts                         | 2 +-
 extensions/ql-vscode/src/local-databases.ts                   | 4 +++-
 .../vscode-tests/minimal-workspace/local-databases.test.ts    | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
index b1c6211f2..cb0a58771 100644
--- a/extensions/ql-vscode/src/extension.ts
+++ b/extensions/ql-vscode/src/extension.ts
@@ -678,7 +678,7 @@ async function activateWithInstalledDistribution(
   }
 
   void extLogger.log("Initializing database manager.");
-  const dbm = new DatabaseManager(ctx, qs, cliServer, extLogger);
+  const dbm = new DatabaseManager(ctx, app, qs, cliServer, extLogger);
 
   // Let this run async.
   void dbm.loadPersistedState();
diff --git a/extensions/ql-vscode/src/local-databases.ts b/extensions/ql-vscode/src/local-databases.ts
index 3d390b472..918ddd5fc 100644
--- a/extensions/ql-vscode/src/local-databases.ts
+++ b/extensions/ql-vscode/src/local-databases.ts
@@ -28,6 +28,7 @@ import { redactableError } from "./pure/errors";
 import { isCodespacesTemplate } from "./config";
 import { QlPackGenerator } from "./qlpack-generator";
 import { QueryLanguage } from "./common/query-language";
+import { App } from "./common/app";
 
 /**
  * databases.ts
@@ -593,6 +594,7 @@ export class DatabaseManager extends DisposableObject {
 
   constructor(
     private readonly ctx: ExtensionContext,
+    private readonly app: App,
     private readonly qs: QueryRunner,
     private readonly cli: cli.CodeQLCliServer,
     public logger: Logger,
@@ -875,7 +877,7 @@ export class DatabaseManager extends DisposableObject {
       this._currentDatabaseItem = item;
       this.updatePersistedCurrentDatabaseItem();
 
-      await vscode.commands.executeCommand(
+      await this.app.commands.execute(
         "setContext",
         "codeQL.currentDatabaseItem",
         item?.name,
diff --git a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
index 6c4167c06..c106110e8 100644
--- a/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
@@ -25,6 +25,7 @@ import * as helpers from "../../../src/helpers";
 import { Setting } from "../../../src/config";
 import { QlPackGenerator } from "../../../src/qlpack-generator";
 import { mockedObject } from "../utils/mocking.helpers";
+import { createMockApp } from "../../__mocks__/appMock";
 
 describe("local databases", () => {
   const MOCK_DB_OPTIONS: FullDatabaseOptions = {
@@ -87,6 +88,7 @@ describe("local databases", () => {
 
     databaseManager = new DatabaseManager(
       extensionContext,
+      createMockApp({}),
       mockedObject<QueryRunner>({
         registerDatabase: registerSpy,
         deregisterDatabase: deregisterSpy,