yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug causing incorrect remote selections in buffers (#52929)

Browse Source 
Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
Cole MillerandConrad Irwin authored and GitHub committed 2026-04-01 21:55:54 +00:00
1 parent e8b8b1ba01
commit 8a28b30c28
1 file changed
+9 -35
Download Patch File Download Diff File Expand all files Collapse all files
crates/multi_buffer/src/multi_buffer.rs
+9 -35
View File
@@ -1714,51 +1714,25 @@ impl MultiBuffer {
cursor_shape: CursorShape,
cx: &mut Context<Self>,
) {
let snapshot = self.snapshot(cx);
let mut selections_by_buffer: HashMap<BufferId, Vec<Selection<text::Anchor>>> =
Default::default();
let snapshot = self.snapshot(cx);
let mut cursor = snapshot.excerpts.cursor::<ExcerptSummary>(());
for selection in selections {
let start = selection.start.seek_target(&snapshot);
cursor.seek(&start, Bias::Left);
while let Some(excerpt) = cursor.item() {
let excerpt_start =
Anchor::in_buffer(excerpt.path_key_index, excerpt.range.context.start);
if excerpt_start.cmp(&selection.end, &snapshot).is_gt() {
break;
}
let buffer = excerpt.buffer_snapshot(&snapshot);
let start = *text::Anchor::max(
&excerpt.range.context.start,
&selection
.start
.excerpt_anchor()
.map(|excerpt_anchor| excerpt_anchor.text_anchor())
.unwrap_or(text::Anchor::min_for_buffer(excerpt.buffer_id)),
buffer,
);
let end = *text::Anchor::min(
&excerpt.range.context.end,
&selection
.end
.excerpt_anchor()
.map(|excerpt_anchor| excerpt_anchor.text_anchor())
.unwrap_or(text::Anchor::max_for_buffer(excerpt.buffer_id)),
buffer,
);
for selection in selections {
for (buffer_snapshot, buffer_range, _) in
snapshot.range_to_buffer_ranges(selection.start..selection.end)
{
selections_by_buffer
.entry(buffer.remote_id())
.entry(buffer_snapshot.remote_id())
.or_default()
.push(Selection {
id: selection.id,
start,
end,
start: buffer_snapshot
.anchor_at(buffer_range.start, selection.start.bias()),
end: buffer_snapshot.anchor_at(buffer_range.end, selection.end.bias()),
reversed: selection.reversed,
goal: selection.goal,
});
cursor.next();
}
}