zed/crates/text
Cole Miller 930f484fe4
git: Follow-up fixes for custom blocks in the side-by-side diff (#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
2026-02-08 20:10:52 -05:00
..
src git: Follow-up fixes for custom blocks in the side-by-side diff (#48747) 2026-02-08 20:10:52 -05:00
Cargo.toml Revert "sum_tree: Replace rayon with futures (#41586) (#41846) 2025-11-03 19:25:15 +00:00
LICENSE-GPL