diff --git a/extensions/ql-vscode/src/common/commands.ts b/extensions/ql-vscode/src/common/commands.ts index 27f303e55..5919ae02c 100644 --- a/extensions/ql-vscode/src/common/commands.ts +++ b/extensions/ql-vscode/src/common/commands.ts @@ -48,6 +48,7 @@ export type BuiltInVsCodeCommands = { title?: string, columnOrOptions?: TextDocumentShowOptions, ) => Promise; + "vscode.open": (uri: Uri) => Promise; "vscode.openFolder": (uri: Uri) => Promise; }; diff --git a/extensions/ql-vscode/src/databases/db-module.ts b/extensions/ql-vscode/src/databases/db-module.ts index 8c287cc32..8d47f75a8 100644 --- a/extensions/ql-vscode/src/databases/db-module.ts +++ b/extensions/ql-vscode/src/databases/db-module.ts @@ -43,7 +43,7 @@ export class DbModule extends DisposableObject { await this.dbConfigStore.initialize(); - this.dbPanel = new DbPanel(this.dbManager, app.credentials); + this.dbPanel = new DbPanel(app, this.dbManager); this.push(this.dbPanel); this.push(this.dbConfigStore); diff --git a/extensions/ql-vscode/src/databases/ui/db-panel.ts b/extensions/ql-vscode/src/databases/ui/db-panel.ts index 7df235347..80a0eec5b 100644 --- a/extensions/ql-vscode/src/databases/ui/db-panel.ts +++ b/extensions/ql-vscode/src/databases/ui/db-panel.ts @@ -1,5 +1,4 @@ import { - commands, QuickPickItem, TreeView, TreeViewExpansionEvent, @@ -31,8 +30,8 @@ import { DbTreeViewItem } from "./db-tree-view-item"; import { getGitHubUrl } from "./db-tree-view-item-action"; import { getControllerRepo } from "../../variant-analysis/run-remote-query"; import { getErrorMessage } from "../../pure/helpers-pure"; -import { Credentials } from "../../common/authentication"; import { DatabasePanelCommands } from "../../common/commands"; +import { App } from "../../common/app"; export interface RemoteDatabaseQuickPickItem extends QuickPickItem { kind: string; @@ -47,8 +46,8 @@ export class DbPanel extends DisposableObject { private readonly treeView: TreeView; public constructor( + private readonly app: App, private readonly dbManager: DbManager, - private readonly credentials: Credentials, ) { super(); @@ -369,13 +368,13 @@ export class DbPanel extends DisposableObject { ); } - await commands.executeCommand("vscode.open", Uri.parse(githubUrl)); + await this.app.commands.execute("vscode.open", Uri.parse(githubUrl)); } private async setupControllerRepository(): Promise { try { // This will also validate that the controller repository is valid - await getControllerRepo(this.credentials); + await getControllerRepo(this.app.credentials); } catch (e: unknown) { if (e instanceof UserCancellationException) { return;