Strict null check work in webview

mjbvz · mjbvz · commit c533c849179a · 2019-02-13T14:20:40.000-08:00
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInput.ts
@@ -228,7 +228,10 @@ export class WebviewEditorInput extends EditorInput {
 		if (!this._container) {
 			this._container = document.createElement('div');
 			this._container.id = `webview-${this._id}`;
-			this._partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
+			const part = this._partService.getContainer(Parts.EDITOR_PART);
+			if (part) {
+				part.appendChild(this._container);
+			}
 		}
 		return this._container;
 	}
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInputFactory.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInputFactory.ts
@@ -19,7 +19,7 @@ interface SerializedWebview {
 	readonly id: number;
 	readonly title: string;
 	readonly options: WebviewInputOptions;
-	readonly extensionLocation: string | UriComponents;
+	readonly extensionLocation: string | UriComponents | undefined;
 	readonly state: any;
 	readonly iconPath: SerializedIconPath | undefined;
 }
@@ -34,7 +34,7 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 
 	public serialize(
 		input: WebviewEditorInput
-	): string {
+	): string | null {
 		// Has no state, don't revive
 		if (!input.state) {
 			return null;
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewEditorService.ts
@@ -39,7 +39,7 @@ export interface IWebviewEditorService {
 		iconPath: { light: URI, dark: URI } | undefined,
 		state: any,
 		options: WebviewInputOptions,
-		extensionLocation: URI
+		extensionLocation: URI | undefined,
 	): WebviewEditorInput;
 
 	revealWebview(
@@ -120,7 +120,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 		if (webview.group === group.id) {
 			this._editorService.openEditor(webview, { preserveFocus }, webview.group);
 		} else {
-			this._editorGroupService.getGroup(webview.group).moveEditor(webview, group, { preserveFocus });
+			this._editorGroupService.getGroup(webview.group!).moveEditor(webview, group, { preserveFocus });
 		}
 	}
 
@@ -146,7 +146,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 					// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
 					let resolve: (value: void) => void;
 					const promise = new Promise<void>(r => { resolve = r; });
-					this._awaitingRevival.push({ input: webview, resolve });
+					this._awaitingRevival.push({ input: webview, resolve: resolve! });
 					return promise;
 				});
 			}
@@ -159,8 +159,9 @@ export class WebviewEditorService implements IWebviewEditorService {
 		viewType: string,
 		reviver: WebviewReviver
 	): IDisposable {
-		if (this._revivers.has(viewType)) {
-			this._revivers.get(viewType).push(reviver);
+		const currentRevivers = this._revivers.get(viewType);
+		if (currentRevivers) {
+			currentRevivers.push(reviver);
 		} else {
 			this._revivers.set(viewType, [reviver]);
 		}
@@ -183,7 +184,8 @@ export class WebviewEditorService implements IWebviewEditorService {
 		webview: WebviewEditorInput
 	): boolean {
 		const viewType = webview.viewType;
-		return this._revivers.has(viewType) && this._revivers.get(viewType).some(reviver => reviver.canRevive(webview));
+		const revivers = this._revivers.get(viewType);
+		return !!revivers && revivers.some(reviver => reviver.canRevive(webview));
 	}
 
 	private async tryRevive(
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -370,8 +370,8 @@ export class WebviewElement extends Disposable {
 			}
 		}
 
-		this._webview = undefined;
-		this._webviewFindWidget = undefined;
+		this._webview = undefined!;
+		this._webviewFindWidget = undefined!;
 		super.dispose();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,10 @@ export class WebviewEditorInput extends EditorInput {`
`228`	`228`	`if (!this._container) {`
`229`	`229`	`this._container = document.createElement('div');`
`230`	`230`	this._container.id = `webview-${this._id}`;
`231`		`- this._partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);`
	`231`	`+ const part = this._partService.getContainer(Parts.EDITOR_PART);`
	`232`	`+ if (part) {`
	`233`	`+ part.appendChild(this._container);`
	`234`	`+ }`
`232`	`235`	`}`
`233`	`236`	`return this._container;`
`234`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,8 @@ export class WebviewElement extends Disposable {`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- this._webview = undefined;`
`374`		`- this._webviewFindWidget = undefined;`
	`373`	`+ this._webview = undefined!;`
	`374`	`+ this._webviewFindWidget = undefined!;`
`375`	`375`	`super.dispose();`
`376`	`376`	`}`
`377`	`377`