debt - IMainNotebookController#removeNotebookDocument

Author: jrieken

src/vs/workbench/api/browser/mainThreadNotebook.ts

@@ -166,14 +166,6 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 		return textModel.applyEdit(modelVersionId, cellEdits, true);
 	}
 
-	async removeNotebookTextModel(uri: URI): Promise<void> {
-		// TODO@rebornix remove this? obsolete?
-		// TODO@rebornix, remove cell should use emitDelta as well to ensure document/editor events are sent together
-		this._proxy.$acceptDocumentAndEditorsDelta({ removedDocuments: [uri] });
-		this._documentEventListenersMapping.get(uri)?.dispose();
-		this._documentEventListenersMapping.delete(uri);
-	}
-
 	private _isDeltaEmpty(delta: INotebookDocumentsAndEditorsDelta) {
 		if (delta.addedDocuments !== undefined && delta.addedDocuments.length > 0) {
 			return false;
@@ -478,9 +470,6 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
 			onDidReceiveMessage: (editorId: string, rendererType: string | undefined, message: unknown) => {
 				this._proxy.$onDidReceiveMessage(editorId, rendererType, message);
 			},
-			removeNotebookDocument: async (uri: URI) => {
-				return this.removeNotebookTextModel(uri);
-			},
 			save: async (uri: URI, token: CancellationToken) => {
 				return this._proxy.$saveNotebook(viewType, uri, token);
 			},

src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts

@@ -919,19 +919,12 @@ export class NotebookService extends Disposable implements INotebookService, ICu
 				}
 			});
 
-			willRemovedEditors.forEach(e => this._notebookEditors.delete(e.getId()));
-
-			const provider = this._notebookProviders.get(modelData!.model.viewType);
-
-			if (provider) {
-				provider.controller.removeNotebookDocument(modelData!.model.uri);
-				modelData!.model.dispose();
-			}
-
+			modelData.model.dispose();
+			modelData.dispose();
 
+			willRemovedEditors.forEach(e => this._notebookEditors.delete(e.getId()));
 			this._onNotebookEditorsRemove.fire(willRemovedEditors.map(e => e));
 			this._onDidRemoveNotebookDocument.fire(modelData.model.uri);
-			modelData.dispose();
 		}
 	}
 }

src/vs/workbench/contrib/notebook/common/notebookService.ts

@@ -28,7 +28,6 @@ export interface IMainNotebookController {
 	reloadNotebook(mainthreadTextModel: NotebookTextModel): Promise<void>;
 	resolveNotebookEditor(viewType: string, uri: URI, editorId: string): Promise<void>;
 	onDidReceiveMessage(editorId: string, rendererType: string | undefined, message: any): void;
-	removeNotebookDocument(uri: URI): Promise<void>;
 	save(uri: URI, token: CancellationToken): Promise<boolean>;
 	saveAs(uri: URI, target: URI, token: CancellationToken): Promise<boolean>;
 	backup(uri: URI, token: CancellationToken): Promise<string | undefined>;