git: Remove unnecessary block map recomputation when splitting SplittableEditor#49075
Merged
cole-miller merged 2 commits intomainfrom Feb 13, 2026
Merged
git: Remove unnecessary block map recomputation when splitting SplittableEditor#49075cole-miller merged 2 commits intomainfrom
SplittableEditor#49075cole-miller merged 2 commits intomainfrom
Conversation
Co-authored-by: Jakub <jakub@zed.dev> Co-authored-by: Cameron McLoughlin <cameron.studdstreet@gmail.com>
Member
Author
|
/cherry-pick preview |
Contributor
|
🍒💥 Cherry-pick did not succeed |
cole-miller
added a commit
that referenced
this pull request
Feb 13, 2026
…tableEditor` (#49075) We had a call to `BlockMap::unfold_intersecting` that ended up recomputing the entire block map for the RHS _without_ spacers, only to throw it away in favor of the version with spacers a few lines down. Now we only sync each block map once in `set_companion`. Release Notes: - Improved performance when toggling from the unified diff to the split diff. Co-authored-by: Jakub <jakub@zed.dev> Co-authored-by: Cameron McLoughlin <cameron.studdstreet@gmail.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
We had a call to
BlockMap::unfold_intersectingthat ended up recomputing the entire block map for the RHS without spacers, only to throw it away in favor of the version with spacers a few lines down. Now we only sync each block map once inset_companion.Release Notes: