fix off by one error for edits and checkpoints #274422
Open
+18
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmitrivMS
reviewed
Oct 31, 2025
| // 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) { |
There was a problem hiding this comment.
Is this tested somewhere? If so, it'd be nice to add tests.
dmitrivMS
reviewed
Oct 31, 2025
| // 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) { |
dmitrivMS
previously approved these changes
Oct 31, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the logic for restoring snapshots in chat editing actions. The change adjusts the index calculation to point to the request before the target request (by subtracting 1 from the findIndex result), and adds special handling for the edge case where this results in a negative index (indicating the first request is being undone).
Key Changes:
- Modified index calculation to subtract 1 from
findIndexresult - Added conditional logic to handle the case when undoing the first request (itemIndex < 0)
- Applied same pattern across both
chatEditingActions.tsandchatExecuteActions.ts
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts | Updates restoreSnapshotWithConfirmation function to adjust index calculation and handle first-request edge case |
| src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts | Updates SubmitAction.run method with same index adjustment and edge case handling |
src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
Outdated
Show resolved
Hide resolved
joshspicer
approved these changes
Oct 31, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #274084
cc @connor4312 ref #273822