maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ignore start/end time when a cell paused during execution

Browse source 
Fix #131373
This commit is contained in:
Rob Lourens 2021-08-22 19:41:48 -07:00
parent f0edba3e02
commit fdf4bff6c8
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/contrib/notebook/browser/contrib/breakpoints/notebookBreakpoints.ts
View file

@ -16,7 +16,7 @@ import { IDebugService, State, IBreakpoint } from 'vs/workbench/contrib/debug/co
import { Thread } from 'vs/workbench/contrib/debug/common/debugModel';
import { getNotebookEditorFromEditorPane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
import { CellEditType, CellUri, NotebookCellsChangeType } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellEditType, CellUri, NotebookCellsChangeType, NullablePartialNotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
@ -195,10 +195,17 @@ class NotebookCellPausing extends Disposable implements IWorkbenchContribution {
const parsed = CellUri.parse(cellUri);
if (parsed) {
const notebookModel = this._notebookService.getNotebookTextModel(parsed.notebook);
const internalMetadata: NullablePartialNotebookCellInternalMetadata = {
isPaused
};
if (isPaused) {
internalMetadata.didPause = true;
}
notebookModel?.applyEdits([{
editType: CellEditType.PartialInternalMetadata,
handle: parsed.handle,
internalMetadata: { isPaused },
internalMetadata,
}], true, undefined, () => undefined, undefined);
}
}

18
src/vs/workbench/contrib/notebook/browser/notebookExecutionServiceImpl.ts
View file

@ -5,6 +5,7 @@
import { IDisposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { NotebookCellTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
import { CellEditType, ICellEditOperation, NotebookCellExecutionState, NotebookCellInternalMetadata } from 'vs/workbench/contrib/notebook/common/notebookCommon';
import { CellExecutionUpdateType, ICellExecuteUpdate, INotebookCellExecution, INotebookExecutionService } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
@ -23,7 +24,7 @@ export class NotebookExecutionService implements INotebookExecutionService {
}
}
function updateToEdit(update: ICellExecuteUpdate, cellHandle: number): ICellEditOperation {
function updateToEdit(update: ICellExecuteUpdate, cellHandle: number, model: NotebookCellTextModel): ICellEditOperation {
if (update.editType === CellExecutionUpdateType.Output) {
return {
editType: CellEditType.Output,
@ -45,7 +46,10 @@ function updateToEdit(update: ICellExecuteUpdate, cellHandle: number): ICellEdit
internalMetadata: {
runState: null,
lastRunSuccess: update.lastRunSuccess,
runEndTime: update.runEndTime
runStartTime: model.internalMetadata.didPause ? null : model.internalMetadata.runStartTime,
runEndTime: model.internalMetadata.didPause ? null : update.runEndTime,
isPaused: false,
didPause: false
}
};
} else if (update.editType === CellExecutionUpdateType.ExecutionState) {
@ -90,7 +94,8 @@ class CellExecution implements INotebookCellExecution, IDisposable {
handle: cellHandle,
internalMetadata: {
runState: NotebookCellExecutionState.Pending,
executionOrder: null
executionOrder: null,
didPause: false
}
};
this._applyExecutionEdits([startExecuteEdit]);
@ -101,7 +106,12 @@ class CellExecution implements INotebookCellExecution, IDisposable {
throw new Error('Cannot update disposed execution');
}
const edits = updates.map(update => updateToEdit(update, this.cellHandle));
const cellModel = this._notebookModel.cells.find(c => c.handle === this.cellHandle);
if (!cellModel) {
throw new Error('Cell not found: ' + this.cellHandle);
}
const edits = updates.map(update => updateToEdit(update, this.cellHandle, cellModel));
this._applyExecutionEdits(edits);
if (updates.some(u => u.editType === CellExecutionUpdateType.Complete)) {

1
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
View file

@ -94,6 +94,7 @@ export interface NotebookCellInternalMetadata {
runStartTimeAdjustment?: number;
runEndTime?: number;
isPaused?: boolean;
didPause?: boolean;
}
export type TransientCellMetadata = { [K in keyof NotebookCellMetadata]?: boolean };