Skip to content

Cherry-pick "git: Remove unnecessary block map recomputation when splitting SplittableEditor (#49075)" to v0.224.x#49127

Merged
cole-miller merged 1 commit intov0.224.xfrom
manual-cherry-pick-split-fix-to-preview
Feb 13, 2026
Merged

Cherry-pick "git: Remove unnecessary block map recomputation when splitting SplittableEditor (#49075)" to v0.224.x#49127
cole-miller merged 1 commit intov0.224.xfrom
manual-cherry-pick-split-fix-to-preview

Conversation

@cole-miller
Copy link
Member

Release Notes:

  • Improved performance when toggling from the unified diff to the split diff.

…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>
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 13, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 13, 2026
@cole-miller cole-miller merged commit ff82952 into v0.224.x Feb 13, 2026
37 checks passed
@cole-miller cole-miller deleted the manual-cherry-pick-split-fix-to-preview branch February 13, 2026 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant