git: Follow-up fixes for custom blocks in the side-by-side diff - #48747
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
cole-miller
marked this pull request as ready for review
February 9, 2026 01:00
cole-miller
enabled auto-merge (squash)
February 9, 2026 01:00
cole-miller
disabled auto-merge
February 9, 2026 01:06
cole-miller
added a commit
that referenced
this pull request
Feb 9, 2026
Restore a call to `BlockMap::read` that went missing in #48747 Release Notes: - N/A
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…industries#48747) - Ensure that both sides are passed the appropriate companion data to preserve spacers when syncing - Remove companion handling in codepaths related to range folding, since this isn't supported in the side-by-side diff - Move handling of buffer folding into the block map - Rework `set_companion` to handle both `DisplayMap`s at once - DRY some code around block map syncing in the `DisplayMap` TODO: - [x] diagnose and fix issue that causes balancing blocks not to render properly when they are adjacent to spacers (e.g. merge conflict buttons) - [x] clear balancing blocks when clearing companion - [x] additional tests: interaction between spacers and balancing blocks, resizing Release Notes: - N/A
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
Restore a call to `BlockMap::read` that went missing in zed-industries#48747 Release Notes: - N/A
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…industries#48747) - Ensure that both sides are passed the appropriate companion data to preserve spacers when syncing - Remove companion handling in codepaths related to range folding, since this isn't supported in the side-by-side diff - Move handling of buffer folding into the block map - Rework `set_companion` to handle both `DisplayMap`s at once - DRY some code around block map syncing in the `DisplayMap` TODO: - [x] diagnose and fix issue that causes balancing blocks not to render properly when they are adjacent to spacers (e.g. merge conflict buttons) - [x] clear balancing blocks when clearing companion - [x] additional tests: interaction between spacers and balancing blocks, resizing Release Notes: - N/A
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
Restore a call to `BlockMap::read` that went missing in zed-industries#48747 Release Notes: - N/A
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.
set_companionto handle bothDisplayMaps at onceDisplayMapTODO:
Release Notes: