microsoft#49054 Do not hide in built viewlets

sandy081 · sandy081 · commit fa93b07de3fc · 2019-03-08T13:09:30.000+01:00
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -34,8 +34,6 @@ import { isUndefinedOrNull } from 'vs/base/common/types';
 import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
-const SCM_VIEWLET_ID = 'workbench.view.scm';
-
 interface ICachedViewlet {
 	id: string;
 	iconUrl?: UriComponents;
@@ -136,7 +134,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		for (const viewlet of this.viewletService.getViewlets()) {
 			this.enableCompositeActions(viewlet);
 			const viewContainer = this.getViewContainer(viewlet.id);
-			if (viewContainer) {
+			if (viewContainer && viewContainer.hideIfEmpty) {
 				const viewDescriptors = this.viewsService.getViewDescriptors(viewContainer);
 				if (viewDescriptors) {
 					this.onDidChangeActiveViews(viewlet, viewDescriptors);
@@ -167,7 +165,7 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 		const viewletDescriptor = this.viewletService.getViewlet(viewlet.getId());
 		if (viewletDescriptor) {
 			const viewContainer = this.getViewContainer(viewletDescriptor.id);
-			if (viewContainer) {
+			if (viewContainer && viewContainer.hideIfEmpty) {
 				const viewDescriptors = this.viewsService.getViewDescriptors(viewContainer);
 				if (viewDescriptors && viewDescriptors.activeViewDescriptors.length === 0) {
 					this.removeComposite(viewletDescriptor.id, true); // Update the composite bar by hiding
@@ -313,6 +311,10 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	}
 
 	private shouldBeHidden(viewletId: string, cachedViewlet: ICachedViewlet): boolean {
+		const viewContainer = this.getViewContainer(viewletId);
+		if (!viewContainer || !viewContainer.hideIfEmpty) {
+			return false;
+		}
 		return cachedViewlet && cachedViewlet.views && cachedViewlet.views.length
 			? cachedViewlet.views.every(({ when }) => !!when && !this.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(when)))
 			: viewletId === TEST_VIEW_CONTAINER_ID /* Hide Test viewlet for the first time or it had no views registered before */;
@@ -488,11 +490,6 @@ export class ActivitybarPart extends Part implements IActivityBarService {
 	}
 
 	private getViewContainer(viewletId: string): ViewContainer | undefined {
-		// TODO: @Joao Remove this after moving SCM Viewlet to ViewContainerViewlet - https://github.com/Microsoft/vscode/issues/49054
-		if (viewletId === SCM_VIEWLET_ID) {
-			return undefined;
-		}
-
 		const viewContainerRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
 		return viewContainerRegistry.get(viewletId);
 	}
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
@@ -67,7 +67,7 @@ export interface IViewContainersRegistry {
 }
 
 export class ViewContainer {
-	protected constructor(readonly id: string, readonly extensionId: ExtensionIdentifier) { }
+	protected constructor(readonly id: string, readonly hideIfEmpty: boolean, readonly extensionId?: ExtensionIdentifier) { }
 }
 
 class ViewContainersRegistryImpl implements IViewContainersRegistry {
@@ -84,15 +84,16 @@ class ViewContainersRegistryImpl implements IViewContainersRegistry {
 		return values(this.viewContainers);
 	}
 
-	registerViewContainer(id: string, extensionId: ExtensionIdentifier): ViewContainer {
+	registerViewContainer(id: string, extensionId?: ExtensionIdentifier): ViewContainer {
 		const existing = this.viewContainers.get(id);
 		if (existing) {
 			return existing;
 		}
+		const hideIfEmpty = id === TEST_VIEW_CONTAINER_ID || !!extensionId;
 
 		const viewContainer = new class extends ViewContainer {
 			constructor() {
-				super(id, extensionId);
+				super(id, hideIfEmpty, extensionId);
 			}
 		};
 		this.viewContainers.set(id, viewContainer);

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export interface IViewContainersRegistry {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`export class ViewContainer {`
`70`		`- protected constructor(readonly id: string, readonly extensionId: ExtensionIdentifier) { }`
	`70`	`+ protected constructor(readonly id: string, readonly hideIfEmpty: boolean, readonly extensionId?: ExtensionIdentifier) { }`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`class ViewContainersRegistryImpl implements IViewContainersRegistry {`
`@@ -84,15 +84,16 @@ class ViewContainersRegistryImpl implements IViewContainersRegistry {`
`84`	`84`	`return values(this.viewContainers);`
`85`	`85`	`}`
`86`	`86`
`87`		`- registerViewContainer(id: string, extensionId: ExtensionIdentifier): ViewContainer {`
	`87`	`+ registerViewContainer(id: string, extensionId?: ExtensionIdentifier): ViewContainer {`
`88`	`88`	`const existing = this.viewContainers.get(id);`
`89`	`89`	`if (existing) {`
`90`	`90`	`return existing;`
`91`	`91`	`}`
	`92`	`+ const hideIfEmpty = id === TEST_VIEW_CONTAINER_ID \|\| !!extensionId;`
`92`	`93`
`93`	`94`	`const viewContainer = new class extends ViewContainer {`
`94`	`95`	`constructor() {`
`95`		`- super(id, extensionId);`
	`96`	`+ super(id, hideIfEmpty, extensionId);`
`96`	`97`	`}`
`97`	`98`	`};`
`98`	`99`	`this.viewContainers.set(id, viewContainer);`