Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 00:59:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove NotebookEditor#onDidDispose

Browse Source
This commit is contained in:
Johannes Rieken
2021-04-09 13:27:29 +02:00
parent 9c40ada615
commit e200749f88
3 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/api/common/extHostNotebook.ts
View File

@@ -669,6 +669,11 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
}
private _createExtHostEditor(document: ExtHostNotebookDocument, editorId: string, data: INotebookEditorAddData) {
if (this._editors.has(editorId)) {
throw new Error(`editor with id ALREADY EXSIST: ${editorId}`);
}
const revivedUri = document.uri;
let webComm = this._webviewComm.get(editorId);
@@ -686,13 +691,10 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
typeof data.viewColumn === 'number' ? typeConverters.ViewColumn.to(data.viewColumn) : undefined
);
this._editors.get(editorId)?.editor.dispose();
this._editors.set(editorId, { editor });
}
$acceptDocumentAndEditorsDelta(delta: INotebookDocumentsAndEditorsDelta): void {
let editorChanged = false;
if (delta.removedDocuments) {
for (const uri of delta.removedDocuments) {
@@ -708,9 +710,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
for (const e of this._editors.values()) {
if (e.editor.notebookData.uri.toString() === revivedUri.toString()) {
e.editor.dispose();
this._editors.delete(e.editor.id);
editorChanged = true;
}
}
}
@@ -782,7 +782,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
if (document) {
this._createExtHostEditor(document, editorModelData.id, editorModelData);
editorChanged = true;
}
}
}
@@ -794,7 +793,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
const editor = this._editors.get(editorid);
if (editor) {
editorChanged = true;
this._editors.delete(editorid);
if (this._activeNotebookEditor?.id === editor.editor.id) {
@@ -806,12 +804,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape {
}
}
if (editorChanged) {
removedEditors.forEach(e => {
e.editor.dispose();
});
}
if (delta.visibleEditors) {
this._visibleNotebookEditors = delta.visibleEditors.map(id => this._editors.get(id)!.editor).filter(editor => !!editor) as ExtHostNotebookEditor[];
const visibleEditorsSet = new Set<string>();