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

check that a cell is still "alive" and only iff so start executing it, fixes https://github.com/microsoft/vscode/issues/123269

Browse Source
This commit is contained in:
Johannes Rieken
2021-05-07 14:14:14 +02:00
parent c948b662f5
commit b177753668
5 changed files with 154 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/api/common/extHostNotebookDocument.ts
View File

@@ -53,10 +53,10 @@ export class ExtHostCell {
readonly uri: URI;
readonly cellKind: CellKind;
private _cell: vscode.NotebookCell | undefined;
private _apiCell: vscode.NotebookCell | undefined;
constructor(
private readonly _notebook: ExtHostNotebookDocument,
readonly notebook: ExtHostNotebookDocument,
private readonly _extHostDocument: ExtHostDocumentsAndEditors,
private readonly _cellData: IMainCellDto,
) {
@@ -74,15 +74,15 @@ export class ExtHostCell {
}
get apiCell(): vscode.NotebookCell {
if (!this._cell) {
if (!this._apiCell) {
const that = this;
const data = this._extHostDocument.getDocument(this.uri);
if (!data) {
throw new Error(`MISSING extHostDocument for notebook cell: ${this.uri}`);
}
this._cell = Object.freeze<vscode.NotebookCell>({
get index() { return that._notebook.getCellIndex(that); },
notebook: that._notebook.apiNotebook,
this._apiCell = Object.freeze<vscode.NotebookCell>({
get index() { return that.notebook.getCellIndex(that); },
notebook: that.notebook.apiNotebook,
kind: extHostTypeConverters.NotebookCellKind.to(this._cellData.cellKind),
document: data.document,
get outputs() { return that._outputs.slice(0); },
@@ -90,7 +90,7 @@ export class ExtHostCell {
get latestExecutionSummary() { return that._previousResult; }
});
}
return this._cell;
return this._apiCell;
}
setOutputs(newOutputs: IOutputDto[]): void {
@@ -278,7 +278,7 @@ export class ExtHostNotebookDocument {
const changeEvent = new RawContentChangeEvent(splice[0], splice[1], [], newCells);
const deletedItems = this._cells.splice(splice[0], splice[1], ...newCells);
for (let cell of deletedItems) {
for (const cell of deletedItems) {
removedCellDocuments.push(cell.uri);
changeEvent.deletedItems.push(cell.apiCell);
}
@@ -349,6 +349,10 @@ export class ExtHostNotebookDocument {
}
}
getCellFromApiCell(apiCell: vscode.NotebookCell): ExtHostCell | undefined {
return this._cells.find(cell => cell.apiCell === apiCell);
}
getCellFromIndex(index: number): ExtHostCell | undefined {
return this._cells[index];
}