From 3a0d4064886d3f0597160257b1a941c27bdf3fa6 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 6 Nov 2018 10:40:46 +0100 Subject: [PATCH] Fix #59926 --- src/vs/workbench/browser/parts/views/views.ts | 2 +- src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts index 96cdcc5adad..e8942821e51 100644 --- a/src/vs/workbench/browser/parts/views/views.ts +++ b/src/vs/workbench/browser/parts/views/views.ts @@ -546,7 +546,7 @@ export class ViewsService extends Disposable implements IViewsService { if (viewDescriptor) { const viewletDescriptor = this.viewletService.getViewlet(viewDescriptor.container.id); if (viewletDescriptor) { - return this.viewletService.openViewlet(viewletDescriptor.id) + return this.viewletService.openViewlet(viewletDescriptor.id, focus) .then((viewlet: IViewsViewlet) => { if (viewlet && viewlet.openView) { return viewlet.openView(id, focus); diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index ac45d0ec1ff..0f0de4f8102 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -1487,7 +1487,9 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle } panel = this.panels.filter(panel => panel instanceof ViewletPanel && panel.id === id)[0]; panel.setExpanded(true); - panel.focus(); + if (focus) { + panel.focus(); + } return TPromise.as(panel); } -- GitLab