Only clean up editors on close not on Panel dispose (#4787)

news/2 Fixes/4786.md

@@ -0,0 +1 @@
+Only clean up a notebook editor when it's closed, not when the panel is disposed.

src/client/datascience/notebook/notebookEditor.ts

@@ -95,7 +95,7 @@ export class NotebookEditor implements INotebookEditor {
                 }
             })
         );
-        disposables.push(model.onDidDispose(this._closed.fire.bind(this._closed, this)));
+        disposables.push(model.onDidDispose(this.dispose.bind(this)));
     }
     @captureTelemetry(Telemetry.SyncAllCells)
     public async syncAllCells(): Promise<void> {

src/client/datascience/notebook/notebookEditorProvider.ts

@@ -184,7 +184,6 @@ export class NotebookEditorProvider implements INotebookEditorProvider {
             return;
         }
         this.trackedVSCodeNotebookEditors.add(editor);
-        this.disposables.push(editor.onDidDispose(() => this.onDidDisposeVSCodeNotebookEditor(editor)));
     }
     private async onDidCloseNotebookDocument(document: NotebookDocument) {
         this.disposeResourceRelatedToNotebookEditor(document.uri);
@@ -207,21 +206,4 @@ export class NotebookEditorProvider implements INotebookEditorProvider {
         this.notebookEditorsByUri.delete(uri.toString());
         this.notebooksWaitingToBeOpenedByUri.delete(uri.toString());
     }
-    /**
-     * We know a notebook editor has been closed.
-     * We need to close/dispose all of our resources related to this notebook document.
-     * However we also need to check if there are other notebooks opened, that are associated with this same notebook.
-     * I.e. we may have closed a duplicate editor.
-     */
-    private async onDidDisposeVSCodeNotebookEditor(closedEditor: VSCodeNotebookEditor) {
-        const uri = closedEditor.document.uri;
-        if (
-            this.vscodeNotebook.notebookEditors.some(
-                (item) => item !== closedEditor && item.document.uri.toString() === uri.toString()
-            )
-        ) {
-            return;
-        }
-        this.disposeResourceRelatedToNotebookEditor(closedEditor.document.uri);
-    }
 }