oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multi_buffer: Remove redundant buffer id field (#43459)

Browse Source 
It is easy for us to get the two fields out of sync causing weird
problems, there is no reason to have both here so.

Release Notes:

- N/A *or* Added/Fixed/Improved ...

Co-authored by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Lukas Wirth
2025-11-25 17:13:16 +01:00
committed by GitHub
parent ab80ef1845
commit fafe1afa61
39 changed files with 378 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/vim/src/motion.rs
+3 -7
View File
@@ -2268,17 +2268,13 @@ fn go_to_line(map: &DisplaySnapshot, display_point: DisplayPoint, line: usize) -
..language::ToOffset::to_offset(&range.context.end, buffer);
if offset >= excerpt_range.start && offset <= excerpt_range.end {
let text_anchor = buffer.anchor_after(offset);
let anchor = Anchor::in_buffer(excerpt, buffer.remote_id(), text_anchor);
let anchor = Anchor::in_buffer(excerpt, text_anchor);
return anchor.to_display_point(map);
} else if offset <= excerpt_range.start {
let anchor = Anchor::in_buffer(excerpt, buffer.remote_id(), range.context.start);
let anchor = Anchor::in_buffer(excerpt, range.context.start);
return anchor.to_display_point(map);
} else {
last_position = Some(Anchor::in_buffer(
excerpt,
buffer.remote_id(),
range.context.end,
));
last_position = Some(Anchor::in_buffer(excerpt, range.context.end));
}
}
crates/vim/src/state.rs
+1 -1
View File
@@ -606,7 +606,7 @@ impl MarksState {
let text_anchors = anchors.get(name)?;
let anchors = text_anchors
.iter()
.map(|anchor| Anchor::in_buffer(excerpt_id, buffer_id, *anchor))
.map(|anchor| Anchor::in_buffer(excerpt_id, *anchor))
.collect();
return Some(Mark::Local(anchors));
}