fixes microsoft#104448

sbatten · sbatten · commit c12abc9bb404 · 2020-08-12T17:01:08.000-07:00
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
@@ -244,6 +244,7 @@ export interface IAddedViewDescriptorRef extends IViewDescriptorRef {
 export interface IAddedViewDescriptorState {
 	viewDescriptor: IViewDescriptor,
 	collapsed?: boolean;
+	visible?: boolean;
 }
 
 export interface IViewContainerModel {
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -692,7 +692,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 			});
 		});
 
-		this.getViewContainerModel(container).add(views.map(view => { return { viewDescriptor: view, collapsed: expandViews ? false : undefined }; }));
+		this.getViewContainerModel(container).add(views.map(view => { return { viewDescriptor: view, collapsed: expandViews ? false : undefined, visible: expandViews }; }));
 	}
 
 	private removeViews(container: ViewContainer, views: IViewDescriptor[]): void {
diff --git a/src/vs/workbench/services/views/common/viewContainerModel.ts b/src/vs/workbench/services/views/common/viewContainerModel.ts
@@ -478,16 +478,16 @@ export class ViewContainerModel extends Disposable implements IViewContainerMode
 			if (state) {
 				// set defaults if not set
 				if (viewDescriptor.workspace) {
-					state.visibleWorkspace = isUndefinedOrNull(state.visibleWorkspace) ? !viewDescriptor.hideByDefault : state.visibleWorkspace;
+					state.visibleWorkspace = isUndefinedOrNull(addedViewDescriptorState.visible) ? (isUndefinedOrNull(state.visibleWorkspace) ? !viewDescriptor.hideByDefault : state.visibleWorkspace) : addedViewDescriptorState.visible;
 				} else {
-					state.visibleGlobal = isUndefinedOrNull(state.visibleGlobal) ? !viewDescriptor.hideByDefault : state.visibleGlobal;
+					state.visibleGlobal = isUndefinedOrNull(addedViewDescriptorState.visible) ? (isUndefinedOrNull(state.visibleGlobal) ? !viewDescriptor.hideByDefault : state.visibleGlobal) : addedViewDescriptorState.visible;
 				}
 				state.collapsed = isUndefinedOrNull(addedViewDescriptorState.collapsed) ? (isUndefinedOrNull(state.collapsed) ? !!viewDescriptor.collapsed : state.collapsed) : addedViewDescriptorState.collapsed;
 			} else {
 				state = {
 					active: false,
-					visibleGlobal: !viewDescriptor.hideByDefault,
-					visibleWorkspace: !viewDescriptor.hideByDefault,
+					visibleGlobal: isUndefinedOrNull(addedViewDescriptorState.visible) ? !viewDescriptor.hideByDefault : addedViewDescriptorState.visible,
+					visibleWorkspace: isUndefinedOrNull(addedViewDescriptorState.visible) ? !viewDescriptor.hideByDefault : addedViewDescriptorState.visible,
 					collapsed: isUndefinedOrNull(addedViewDescriptorState.collapsed) ? !!viewDescriptor.collapsed : addedViewDescriptorState.collapsed,
 				};
 			}

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ export interface IAddedViewDescriptorRef extends IViewDescriptorRef {`
`244`	`244`	`export interface IAddedViewDescriptorState {`
`245`	`245`	`viewDescriptor: IViewDescriptor,`
`246`	`246`	`collapsed?: boolean;`
	`247`	`+ visible?: boolean;`
`247`	`248`	`}`
`248`	`249`
`249`	`250`	`export interface IViewContainerModel {`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor`
`692`	`692`	`});`
`693`	`693`	`});`
`694`	`694`
`695`		`- this.getViewContainerModel(container).add(views.map(view => { return { viewDescriptor: view, collapsed: expandViews ? false : undefined }; }));`
	`695`	`+ this.getViewContainerModel(container).add(views.map(view => { return { viewDescriptor: view, collapsed: expandViews ? false : undefined, visible: expandViews }; }));`
`696`	`696`	`}`
`697`	`697`
`698`	`698`	`private removeViews(container: ViewContainer, views: IViewDescriptor[]): void {`