Merged
Conversation
bpasero
approved these changes
Jan 30, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an invariant violation in the tryRebase method by improving conflict detection logic and adding comprehensive test coverage for rebase invariants.
Changes:
- Enhanced conflict detection in
tryRebaseto handle inserts strictly inside ranges and inserts at range boundaries - Removed redundant sorted/disjoint invariant checking code that was causing false positives
- Added 1000 randomized test cases validating five key rebase invariants (symmetry, diamond property, empty edit behavior, and TP2)
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/vs/editor/common/core/edits/stringEdit.ts |
Fixed conflict detection logic by adding helper function and updating rebase conditions; added parse method for debugging |
src/vs/editor/common/core/ranges/offsetRange.ts |
Added documentation clarifying that intersects returns false for empty ranges |
src/vs/editor/test/common/core/stringEdit.test.ts |
Added comprehensive test suite with 1000 randomized cases validating rebase invariants |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.