mirror of
https://github.com/zed-industries/zed.git
synced 2026-05-31 21:31:32 +00:00
930f484fe4
- 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 |
||
|---|---|---|
| .. | ||
| anchor.rs | ||
| locator.rs | ||
| network.rs | ||
| operation_queue.rs | ||
| patch.rs | ||
| selection.rs | ||
| subscription.rs | ||
| tests.rs | ||
| text.rs | ||
| undo_map.rs | ||