From 8b5824e54d7e52a7ae8fc2ae4874c635022ba2db Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 13 Jun 2018 10:03:29 +0200 Subject: [PATCH] Fix #51713 --- src/vs/workbench/browser/parts/views/views.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts index ca07278ca55..217543d55d0 100644 --- a/src/vs/workbench/browser/parts/views/views.ts +++ b/src/vs/workbench/browser/parts/views/views.ts @@ -341,13 +341,12 @@ export class ContributableViewsModel extends Disposable { for (const viewDescriptor of viewDescriptors) { const viewState = this.viewStates.get(viewDescriptor.id); if (viewState) { - if (isUndefinedOrNull(viewState.collapsed)) { - // collapsed state was not set, so set it from view descriptor - viewState.collapsed = !!viewDescriptor.collapsed; - } + // set defaults if not set + viewState.visible = isUndefinedOrNull(viewState.visible) ? !viewDescriptor.hideByDefault : viewState.visible; + viewState.collapsed = isUndefinedOrNull(viewState.collapsed) ? !!viewDescriptor.collapsed : viewState.collapsed; } else { this.viewStates.set(viewDescriptor.id, { - visible: true, + visible: !viewDescriptor.hideByDefault, collapsed: viewDescriptor.collapsed }); } @@ -464,7 +463,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel { } for (const id of Object.keys(storedViewsStates)) { if (!viewStates.has(id)) { - viewStates.set(id, { ...storedViewsStates[id], ...{ visible: true } }); + viewStates.set(id, { ...storedViewsStates[id] }); } } return viewStates; -- GitLab