development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay output height update on cell re-execution. (#171018)

Browse source
This commit is contained in:
Peng Lyu 2023-01-10 17:30:37 -08:00 committed by GitHub
parent bb80f439c9
commit a40ce8aa30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.ts
View file

@ -29,6 +29,7 @@ import { CodeCellRenderTemplate } from 'vs/workbench/contrib/notebook/browser/vi
import { CodeCellViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
import { CellUri, IOrderedMimeType, NotebookCellOutputsSplice, RENDERER_NOT_AVAILABLE } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
import { INotebookKernel } from 'vs/workbench/contrib/notebook/common/notebookKernelService';
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
@ -431,6 +432,11 @@ class OutputEntryViewHandler {
}
}
const enum CellOutputUpdateContext {
Execution = 1,
Other = 2
}
export class CellOutputContainer extends CellContentPart {
private _outputEntries: OutputEntryViewHandler[] = [];
@ -444,12 +450,23 @@ export class CellOutputContainer extends CellContentPart {
private readonly templateData: CodeCellRenderTemplate,
private options: { limit: number },
@IOpenerService private readonly openerService: IOpenerService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
@IInstantiationService private readonly instantiationService: IInstantiationService
) {
super();
this._register(viewCell.onDidStartExecution(() => {
viewCell.updateOutputMinHeight(viewCell.layoutInfo.outputTotalHeight);
}));
this._register(viewCell.onDidStopExecution(() => {
this._validateFinalOutputHeight(false);
}));
this._register(viewCell.onDidChangeOutputs(splice => {
this._updateOutputs(splice);
const executionState = this._notebookExecutionStateService.getCellExecution(viewCell.uri);
const context = executionState ? CellOutputUpdateContext.Execution : CellOutputUpdateContext.Other;
this._updateOutputs(splice, context);
}));
this._register(viewCell.onDidChangeLayout(() => {
@ -543,7 +560,7 @@ export class CellOutputContainer extends CellContentPart {
}
}
private _updateOutputs(splice: NotebookCellOutputsSplice) {
private _updateOutputs(splice: NotebookCellOutputsSplice, context: CellOutputUpdateContext = CellOutputUpdateContext.Other) {
const previousOutputHeight = this.viewCell.layoutInfo.outputTotalHeight;
// for cell output update, we make sure the cell does not shrink before the new outputs are rendered.
@ -556,10 +573,10 @@ export class CellOutputContainer extends CellContentPart {
}
this.viewCell.spliceOutputHeights(splice.start, splice.deleteCount, splice.newOutputs.map(_ => 0));
this._renderNow(splice);
this._renderNow(splice, context);
}
private _renderNow(splice: NotebookCellOutputsSplice) {
private _renderNow(splice: NotebookCellOutputsSplice, context: CellOutputUpdateContext) {
if (splice.start >= this.options.limit) {
// splice items out of limit
return;
@ -664,7 +681,8 @@ export class CellOutputContainer extends CellContentPart {
this._relayoutCell();
// if it's clearing all outputs, or outputs are all rendered synchronously
// shrink immediately as the final output height will be zero.
this._validateFinalOutputHeight(false || this.viewCell.outputsViewModels.length === 0);
// if it's rerun, then the output clearing might be temporary, so we don't shrink immediately
this._validateFinalOutputHeight(false || (context === CellOutputUpdateContext.Other && this.viewCell.outputsViewModels.length === 0));
}
private _generateShowMoreElement(disposables: DisposableStore): HTMLElement {

17
src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.ts
View file

@ -21,6 +21,7 @@ import { NotebookOptionsChangeEvent } from 'vs/workbench/contrib/notebook/common
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { BaseCellViewModel } from './baseCellViewModel';
import { NotebookLayoutInfo } from 'vs/workbench/contrib/notebook/browser/notebookViewEvents';
import { INotebookExecutionStateService } from 'vs/workbench/contrib/notebook/common/notebookExecutionStateService';
export class CodeCellViewModel extends BaseCellViewModel implements ICellViewModel {
readonly cellKind = CellKind.Code;
@ -28,6 +29,11 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
protected readonly _onLayoutInfoRead = this._register(new Emitter<void>());
readonly onLayoutInfoRead = this._onLayoutInfoRead.event;
protected readonly _onDidStartExecution = this._register(new Emitter<void>());
readonly onDidStartExecution = this._onDidStartExecution.event;
protected readonly _onDidStopExecution = this._register(new Emitter<void>());
readonly onDidStopExecution = this._onDidStopExecution.event;
protected readonly _onDidChangeOutputs = this._register(new Emitter<NotebookCellOutputsSplice>());
readonly onDidChangeOutputs = this._onDidChangeOutputs.event;
@ -116,6 +122,7 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
readonly viewContext: ViewContext,
@IConfigurationService configurationService: IConfigurationService,
@INotebookService private readonly _notebookService: INotebookService,
@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
@ITextModelService modelService: ITextModelService,
@IUndoRedoService undoRedoService: IUndoRedoService,
@ICodeEditorService codeEditorService: ICodeEditorService
@ -144,6 +151,16 @@ export class CodeCellViewModel extends BaseCellViewModel implements ICellViewMod
dispose(removedOutputs);
}));
this._register(this._notebookExecutionStateService.onDidChangeCellExecution(e => {
if (e.affectsCell(model.uri)) {
if (e.changed) {
this._onDidStartExecution.fire();
} else {
this._onDidStopExecution.fire();
}
}
}));
this._outputCollection = new Array(this.model.outputs.length);
this._layoutInfo = {