diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index fdd48d86fe8e08200ffe913b44646752e4bc7cde..54937917410e0a12806a3d5d43ccbc03c449c400 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -547,6 +547,7 @@ "./vs/workbench/browser/parts/quickopen/quickopen.ts", "./vs/workbench/browser/parts/statusbar/statusbar.ts", "./vs/workbench/browser/parts/statusbar/statusbarPart.ts", + "./vs/workbench/browser/parts/views/views.ts", "./vs/workbench/browser/viewlet.ts", "./vs/workbench/common/actions.ts", "./vs/workbench/common/activity.ts", diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts index 6324d584f9cec9b62affc590b02ceab0522bada3..131f1d709c364026c42aeacc5168eb7c3757011c 100644 --- a/src/vs/workbench/browser/parts/views/views.ts +++ b/src/vs/workbench/browser/parts/views/views.ts @@ -357,7 +357,7 @@ export class ContributableViewsModel extends Disposable { } else { this.viewStates.set(viewDescriptor.id, { visible: !viewDescriptor.hideByDefault, - collapsed: viewDescriptor.collapsed + collapsed: !!viewDescriptor.collapsed }); } } @@ -369,7 +369,7 @@ export class ContributableViewsModel extends Disposable { ).reverse(); const toRemove: { index: number, viewDescriptor: IViewDescriptor }[] = []; - const toAdd: { index: number, viewDescriptor: IViewDescriptor, size: number, collapsed: boolean }[] = []; + const toAdd: { index: number, viewDescriptor: IViewDescriptor, size?: number, collapsed: boolean }[] = []; for (const splice of splices) { const startViewDescriptor = this.viewDescriptors[splice.start]; @@ -436,7 +436,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel { } private saveViewsStates(): void { - const storedViewsStates: { [id: string]: { collapsed: boolean, size: number, order: number } } = {}; + const storedViewsStates: { [id: string]: { collapsed: boolean, size?: number, order?: number } } = {}; let hasState = false; for (const viewDescriptor of this.viewDescriptors) { @@ -459,7 +459,7 @@ export class PersistentContributableViewsModel extends ContributableViewsModel { for (const viewDescriptor of viewDescriptors) { if (viewDescriptor.canToggleVisibility) { const viewState = this.viewStates.get(viewDescriptor.id); - storedViewsVisibilityStates.set(viewDescriptor.id, { id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : undefined }); + storedViewsVisibilityStates.set(viewDescriptor.id, { id: viewDescriptor.id, isHidden: viewState ? !viewState.visible : false }); } } this.storageService.store(this.hiddenViewsStorageId, JSON.stringify(values(storedViewsVisibilityStates)), StorageScope.GLOBAL); diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 2f562f264f1c22553e60ce4c497e2e7cc0a6a53e..721071521e4e4882766b370f3e933b8d607bf132 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -229,7 +229,7 @@ export const IViewsService = createDecorator('viewsService'); export interface IViewsService { _serviceBrand: any; - openView(id: string, focus?: boolean): Promise; + openView(id: string, focus?: boolean): Promise; getViewDescriptors(container: ViewContainer): IViewDescriptorCollection; }