diff --git a/extensions/sql-database-projects/src/controllers/databaseProjectTreeViewProvider.ts b/extensions/sql-database-projects/src/controllers/databaseProjectTreeViewProvider.ts index 70f2a573cf..b2d2fcd398 100644 --- a/extensions/sql-database-projects/src/controllers/databaseProjectTreeViewProvider.ts +++ b/extensions/sql-database-projects/src/controllers/databaseProjectTreeViewProvider.ts @@ -67,7 +67,7 @@ export class SqlDatabaseProjectTreeViewProvider implements vscode.TreeDataProvid this.treeView = value; } - public async focus(project: Project) { + public async focus(project: Project): Promise { const projNode = this.roots.find(x => x instanceof ProjectRootTreeItem ? (x).project === project : false); if (projNode) { diff --git a/extensions/sql-database-projects/src/controllers/mainController.ts b/extensions/sql-database-projects/src/controllers/mainController.ts index b8f66ee4f2..e89c6ce08e 100644 --- a/extensions/sql-database-projects/src/controllers/mainController.ts +++ b/extensions/sql-database-projects/src/controllers/mainController.ts @@ -95,7 +95,7 @@ export default class MainController implements Disposable { await this.projectsController.openProject(file); } - this.projectsController.focusProject(this.projectsController.projects[prevCount]); // focus the first of the newly-opened projects + await this.projectsController.focusProject(this.projectsController.projects[prevCount]); // focus the first of the newly-opened projects } } catch (err) { diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index a5080afe4a..9cb3fe5230 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -94,10 +94,10 @@ export class ProjectsController { return newProject; } - public async focusProject(project?: Project) { + public async focusProject(project?: Project): Promise { if (project && this.projects.includes(project)) { await this.apiWrapper.executeCommand('sqlDatabaseProjectsView.focus'); - this.projectTreeViewProvider.focus(project); + await this.projectTreeViewProvider.focus(project); } } @@ -619,7 +619,7 @@ export class ProjectsController { //Refresh project to show the added files this.refreshProjectsTree(); - this.focusProject(project); + await this.focusProject(project); } catch (err) { this.apiWrapper.showErrorMessage(utils.getErrorMessage(err));