avoid events if notebook webview is disposed.

rebornix · rebornix · commit 0ac03e433121 · 2020-06-21T13:34:16.000-07:00
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -1230,6 +1230,9 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 	dispose() {
 		this._isDisposed = true;
+		// dispose webview first
+		this._webview?.dispose();
+
 		this.notebookService.removeNotebookEditor(this);
 		const keys = Object.keys(this._contributions);
 		for (let i = 0, len = keys.length; i < len; i++) {
@@ -1239,7 +1242,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
 
 		this._localStore.clear();
 		this._list?.dispose();
-		this._webview?.dispose();
 
 		this._overlayContainer.remove();
 		this.viewModel?.dispose();
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -327,6 +327,10 @@ ${loaderJs}
 		this._register(this.webview);
 
 		this._register(this.webview.onDidClickLink(link => {
+			if (this._disposed) {
+				return;
+			}
+
 			if (!link) {
 				return;
 			}
@@ -338,6 +342,10 @@ ${loaderJs}
 		}));
 
 		this._register(this.webview.onDidReload(() => {
+			if (this._disposed) {
+				return;
+			}
+
 			this.preloadsCache.clear();
 			for (const [output, inset] of this.insetMapping.entries()) {
 				this.updateRendererPreloads(inset.preloads);
@@ -346,6 +354,10 @@ ${loaderJs}
 		}));
 
 		this._register(this.webview.onMessage((data: IMessage) => {
+			if (this._disposed) {
+				return;
+			}
+
 			if (data.__vscode_notebook_message) {
 				if (data.type === 'dimension') {
 					let height = data.data.height;
@@ -718,6 +730,10 @@ ${loaderJs}
 	}
 
 	private _sendMessageToWebview(message: ToWebviewMessage) {
+		if (this._disposed) {
+			return;
+		}
+
 		this.webview.postMessage(message);
 	}
 
@@ -727,6 +743,7 @@ ${loaderJs}
 
 	dispose() {
 		this._disposed = true;
+		this.webview.dispose();
 		super.dispose();
 	}
 }
