Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix stale[*] execution indicator on undo#18173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
Darshan808 wants to merge4 commits intojupyterlab:main
base:main
Choose a base branch
Loading
fromDarshan808:fix-cell-state-in-undo
Draft
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletionspackages/notebook/src/actions.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -387,6 +387,18 @@ export namespace NotebookActions {
: undefined
};

// Keep this logic outside of transact to avoid them on undo
toDelete.forEach(index => {
const cellToDelete = cells.get(index);
if (cellToDelete.type === 'code') {
(cellToDelete as ICodeCellModel).sharedModel.executionState = 'idle';
}
});
const activeCell = cells.get(active);
if (activeCell.type === 'code') {
(activeCell as ICodeCellModel).sharedModel.executionState = 'idle';
}

// Make the changes while preserving history.
model.sharedModel.transact(() => {
model.sharedModel.deleteCell(active);
Expand Down
40 changes: 40 additions & 0 deletionspackages/notebook/test/actions.spec.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1961,6 +1961,46 @@
NotebookActions.undo(widget);
expect(widget.widgets.length).toBe(count-1);
});

it('should reset execution state to idle after undoing a merge',()=>{
constcell=widget.widgets[0]asCodeCell;
widget.activeCellIndex=0;
constinitialSource='line1\nline2';
cell.model.sharedModel.setSource(initialSource);
// Simulate running cell
cell.model.sharedModel.executionState='running';
// Split the first cell
consteditor=cell.editorasCodeEditor.IEditor;
widget.activeCellIndex=0;
editor.setCursorPosition(editor.getPositionAt(6)!);// Split after 'line1'
NotebookActions.splitCell(widget);
constfirstSplitCell=widget.widgets[0]asCodeCell;
constsecondSplitCell=widget.widgets[1]asCodeCell;
expect(firstSplitCell.model.sharedModel.getSource()).toBe('line1');
expect(secondSplitCell.model.sharedModel.getSource()).toBe('line2');
expect(firstSplitCell.model.sharedModel.executionState).toBe('idle');
expect(secondSplitCell.model.sharedModel.executionState).toBe(
'running'
);
// Merge cells
widget.activeCellIndex=0;
NotebookActions.mergeCells(widget,false,false);
constmergedCell=widget.widgets[0]asCodeCell;
expect(mergedCell.model.sharedModel.getSource()).toBe(initialSource);
expect(mergedCell.model.sharedModel.executionState).toBe('idle');
// Undo the merge (which splits the cells again)
NotebookActions.undo(widget);
Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Not sure why thisundo isn't undoing the changes!

constfirstCellAfterUndo=widget.widgets[0]asCodeCell;
constsecondCellAfterUndo=widget.widgets[1]asCodeCell;
expect(firstCellAfterUndo.model.sharedModel.getSource()).toBe('line1');

Check failure on line 1995 in packages/notebook/test/actions.spec.ts

View workflow job for this annotation

GitHub Actions/ JS (3.13, js-notebook)

@jupyterlab/notebook › NotebookActions › #undo() › should reset execution state to idle after undoing a merge

expect(received).toBe(expected) // Object.is equality- Expected  - 0+ Received  + 1  line1+ line2    at Object.<anonymous> (test/actions.spec.ts:1995:66)

Check failure on line 1995 in packages/notebook/test/actions.spec.ts

View workflow job for this annotation

GitHub Actions/ JS (3.13, js-notebook)

@jupyterlab/notebook › NotebookActions › #undo() › should reset execution state to idle after undoing a merge

expect(received).toBe(expected) // Object.is equality- Expected  - 0+ Received  + 1  line1+ line2    at Object.<anonymous> (test/actions.spec.ts:1995:66)

Check failure on line 1995 in packages/notebook/test/actions.spec.ts

View workflow job for this annotation

GitHub Actions/ JS (3.13, js-notebook)

@jupyterlab/notebook › NotebookActions › #undo() › should reset execution state to idle after undoing a merge

expect(received).toBe(expected) // Object.is equality- Expected  - 0+ Received  + 1  line1+ line2    at Object.<anonymous> (test/actions.spec.ts:1995:66)
expect(secondCellAfterUndo.model.sharedModel.getSource()).toBe('line2');
expect(firstCellAfterUndo.model.sharedModel.executionState).toBe(
'idle'
);
expect(secondCellAfterUndo.model.sharedModel.executionState).toBe(
'idle'
);
});
});

describe('#redo()',()=>{
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp