Fix raw kernel disposed problem (microsoft#13373)

rchiodo · web-flow · commit 0441636d3c0b · 2020-08-10T15:42:16.000-07:00
* Fix intermittent problem with notebook being disposed

* Fix for other promise too (caught by functional tests)
diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts
@@ -825,6 +825,12 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
     }
 
     protected async ensureConnectionAndNotebook(): Promise<void> {
+        // Start over if we somehow end up with a disposed notebook.
+        if (this._notebook && this._notebook.disposed) {
+            this._notebook = undefined;
+            this.notebookPromise = undefined;
+            this.connectionAndNotebookPromise = undefined;
+        }
         if (!this.connectionAndNotebookPromise) {
             this.connectionAndNotebookPromise = this.ensureConnectionAndNotebookImpl();
         }

Original file line number	Diff line number	Diff line change
`@@ -825,6 +825,12 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp`
`825`	`825`	`}`
`826`	`826`
`827`	`827`	`protected async ensureConnectionAndNotebook(): Promise<void> {`
	`828`	`+ // Start over if we somehow end up with a disposed notebook.`
	`829`	`+ if (this._notebook && this._notebook.disposed) {`
	`830`	`+ this._notebook = undefined;`
	`831`	`+ this.notebookPromise = undefined;`
	`832`	`+ this.connectionAndNotebookPromise = undefined;`
	`833`	`+ }`
`828`	`834`	`if (!this.connectionAndNotebookPromise) {`
`829`	`835`	`this.connectionAndNotebookPromise = this.ensureConnectionAndNotebookImpl();`
`830`	`836`	`}`