adopt changes from core to ensure disjoint edits #3281
Merged
+23
−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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adopts changes from VS Code core (microsoft/vscode) to fix issue #291596, which relates to ensuring disjoint edits in the string edit rebasing algorithm.
Changes:
- Added tracking of the last edit's end position (
lastEndEx) to ensure the sorted/disjoint invariant is maintained during edit transformation - Added validation checks before adding transformed edits to prevent violations of the disjoint/sorted requirement
- When overlap is not allowed (
noOverlap), the function returnsundefinedif an invariant violation is detected - When overlap is allowed, conflicting edits are skipped instead of being added
pwang347
approved these changes
Jan 29, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
should fix microsoft/vscode#291596