From 37485c256869c9dd3455937c9b288f8fd6441123 Mon Sep 17 00:00:00 2001
From: SteVen Batten <steven.m.batten@outlook.com>
Date: Tue, 21 Apr 2020 11:09:31 -0700
Subject: [PATCH] add alwaysUseContainerInfo for built-in viewlets

---
 src/vs/workbench/common/views.ts                                | 2 ++
 src/vs/workbench/contrib/debug/browser/debug.contribution.ts    | 1 +
 .../contrib/extensions/browser/extensions.contribution.ts       | 1 +
 src/vs/workbench/contrib/files/browser/explorerViewlet.ts       | 1 +
 src/vs/workbench/contrib/scm/browser/scm.contribution.ts        | 1 +
 src/vs/workbench/services/views/common/viewContainerModel.ts    | 2 +-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index dbdcdccdf92..80f49870df6 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -47,6 +47,8 @@ export interface IViewContainerDescriptor {
 
 	readonly icon?: string | URI;
 
+	readonly alwaysUseContainerInfo?: boolean;
+
 	readonly order?: number;
 
 	readonly focusCommand?: { id: string, keybindings?: IKeybindings };
diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index e9c6fb869bb..f6de38eb802 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -75,6 +75,7 @@ const viewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewCo
 	name: nls.localize('run', "Run"),
 	ctorDescriptor: new SyncDescriptor(DebugViewPaneContainer),
 	icon: 'codicon-debug-alt-2',
+	alwaysUseContainerInfo: true,
 	order: 2
 }, ViewContainerLocation.Sidebar);
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 0f5f66c4d63..68c115421fa 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -85,6 +85,7 @@ Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegis
 		icon: 'codicon-extensions',
 		order: 4,
 		rejectAddedViews: true,
+		alwaysUseContainerInfo: true
 	}, ViewContainerLocation.Sidebar);
 
 
diff --git a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 9ea99e0896f..c25220f2c9a 100644
--- a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -263,6 +263,7 @@ export const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry
 	ctorDescriptor: new SyncDescriptor(ExplorerViewPaneContainer),
 	storageId: 'workbench.explorer.views.state',
 	icon: Codicon.files.classNames,
+	alwaysUseContainerInfo: true,
 	order: 0
 }, ViewContainerLocation.Sidebar);
 
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 2a490cadde6..dc5b337cfec 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -54,6 +54,7 @@ Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegis
 	ctorDescriptor: new SyncDescriptor(SCMViewPaneContainer),
 	storageId: 'workbench.scm.views.state',
 	icon: Codicon.sourceControl.classNames,
+	alwaysUseContainerInfo: true,
 	order: 2
 }, ViewContainerLocation.Sidebar);
 
diff --git a/src/vs/workbench/services/views/common/viewContainerModel.ts b/src/vs/workbench/services/views/common/viewContainerModel.ts
index 8f6c8e19e0f..d24fd96abea 100644
--- a/src/vs/workbench/services/views/common/viewContainerModel.ts
+++ b/src/vs/workbench/services/views/common/viewContainerModel.ts
@@ -341,7 +341,7 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 
 	private updateContainerInfo(): void {
 		/* Use default container info if one of the visible view descriptors belongs to the current container by default */
-		const useDefaultContainerInfo = this.visibleViewDescriptors.length === 0 || this.visibleViewDescriptors.some(v => Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).getViewContainer(v.id) === this.container);
+		const useDefaultContainerInfo = this.container.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || this.visibleViewDescriptors.some(v => Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).getViewContainer(v.id) === this.container);
 		const title = useDefaultContainerInfo ? this.container.name : this.visibleViewDescriptors[0]?.name || '';
 		let titleChanged: boolean = false;
 		if (this._title !== title) {