Skip to content

fix off by one error for edits and checkpoints #274422

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
+18 −8
Closed

fix off by one error for edits and checkpoints #274422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b072e78
fix off by one error for edits and checkpoints
justschen Oct 31, 2025
ad9fbf8
address some copilot comments
justschen Oct 31, 2025
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
11 changes: 8 additions & 3 deletions src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ abstract class SubmitAction extends Action2 {

if (requestId) {
const chatRequests = chatModel.getRequests();
const itemIndex = chatRequests.findIndex(request => request.id === requestId);
const itemIndex = chatRequests.findIndex(request => request.id === requestId) - 1;
const editsToUndo = chatRequests.length - itemIndex;

const requestsToRemove = chatRequests.slice(itemIndex);
Expand Down Expand Up @@ -149,8 +149,13 @@ abstract class SubmitAction extends Action2 {
}

// Restore the snapshot to what it was before the request(s) that we deleted
const snapshotRequestId = chatRequests[itemIndex].id;
await session.restoreSnapshot(snapshotRequestId, undefined);
if (itemIndex < 0) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this tested somewhere? If so, it'd be nice to add tests.

const snapshotRequestId = chatRequests[0].id;
chatService.removeRequest(widget.viewModel.sessionResource, snapshotRequestId);
} else {
const snapshotRequestId = chatRequests[itemIndex].id;
await session.restoreSnapshot(snapshotRequestId, undefined);
}
}
} else if (widget?.viewModel?.model.checkpoint) {
widget.viewModel.model.setCheckpoint(undefined);
Expand Down
11 changes: 8 additions & 3 deletions src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ async function restoreSnapshotWithConfirmation(accessor: ServicesAccessor, item:

if (requestId) {
const chatRequests = chatModel.getRequests();
const itemIndex = chatRequests.findIndex(request => request.id === requestId);
const itemIndex = chatRequests.findIndex(request => request.id === requestId) - 1;
const editsToUndo = chatRequests.length - itemIndex;

const requestsToRemove = chatRequests.slice(itemIndex);
Expand Down Expand Up @@ -367,8 +367,13 @@ async function restoreSnapshotWithConfirmation(accessor: ServicesAccessor, item:
}

// Restore the snapshot to what it was before the request(s) that we deleted
const snapshotRequestId = chatRequests[itemIndex].id;
await session.restoreSnapshot(snapshotRequestId, undefined);
if (itemIndex < 0 && widget?.viewModel?.sessionResource) {
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

const snapshotRequestId = chatRequests[0].id;
chatService.removeRequest(widget.viewModel.sessionResource, snapshotRequestId);
} else {
const snapshotRequestId = chatRequests[itemIndex].id;
await session.restoreSnapshot(snapshotRequestId, undefined);
}
}
}

Expand Down
Loading