Fix #93538. remove output in webview first before removing a cell

microsoft · Mar 27, 2020 · 4486892 · 4486892
1 parent 612b400
commit 4486892
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -342,11 +342,27 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor {
 		this.localStore.add(this.notebookViewModel.onDidChangeViewCells((e) => {
 			if (e.synchronous) {
 				e.splices.reverse().forEach((diff) => {
+					// remove output in the webview
+					for (let i = diff[0]; i < diff[0] + diff[1]; i++) {
+						const cell = this.list?.element(i);
+						cell?.cell.outputs.forEach(output => {
+							this.removeInset(output);
+						});
+					}
+
 					this.list?.splice(diff[0], diff[1], diff[2]);
 				});
 			} else {
 				DOM.scheduleAtNextAnimationFrame(() => {
 					e.splices.reverse().forEach((diff) => {
+						// remove output in the webview
+						for (let i = diff[0]; i < diff[0] + diff[1]; i++) {
+							const cell = this.list?.element(i);
+							cell?.cell.outputs.forEach(output => {
+								this.removeInset(output);
+							});
+						}
+
 						this.list?.splice(diff[0], diff[1], diff[2]);
 					});
 				});

diff --git a/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts b/src/vs/workbench/contrib/notebook/test/testNotebookEditor.ts
@@ -23,6 +23,9 @@ import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/v
 
 export class TestCell implements ICell {
 	uri: URI;
+	private _onDidChangeContent = new Emitter<void>();
+	onDidChangeContent: Event<void> = this._onDidChangeContent.event;
+
 	private _onDidChangeOutputs = new Emitter<NotebookCellOutputsSplice[]>();
 	onDidChangeOutputs: Event<NotebookCellOutputsSplice[]> = this._onDidChangeOutputs.event;
 	private _onDidChangeLanguage = new Emitter<string>();