From ac8cdbb2273dd3c1cfb94442bdcd53479ba452a2 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 7 Jan 2019 15:57:53 -0800
Subject: [PATCH] Strict null check views

---
 src/tsconfig.strictNullChecks.json            | 1 +
 src/vs/workbench/browser/parts/views/views.ts | 8 ++++----
 src/vs/workbench/common/views.ts              | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json
index fdd48d86fe8..54937917410 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 6324d584f9c..131f1d709c3 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 2f562f264f1..721071521e4 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -229,7 +229,7 @@ export const IViewsService = createDecorator<IViewsService>('viewsService');
 export interface IViewsService {
 	_serviceBrand: any;
 
-	openView(id: string, focus?: boolean): Promise<IView>;
+	openView(id: string, focus?: boolean): Promise<IView | null>;
 
 	getViewDescriptors(container: ViewContainer): IViewDescriptorCollection;
 }
-- 
GitLab