mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 00:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Clip anchors created on MultiBuffer's trailing newlines or headers

Browse source
This commit is contained in:
Antonio Scandurra 2021-12-14 12:28:27 +01:00
parent 1b67f19edc
commit 2d1ff8f606
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/editor/src/multi_buffer.rs
View file

@ -1080,9 +1080,14 @@ impl MultiBufferSnapshot {
let mut cursor = self.excerpts.cursor::<(usize, Option<&ExcerptId>)>(); let mut cursor = self.excerpts.cursor::<(usize, Option<&ExcerptId>)>();
cursor.seek(&offset, bias, &()); cursor.seek(&offset, bias, &());
if let Some(excerpt) = cursor.item() { if let Some(excerpt) = cursor.item() {
let overshoot = let start_after_header = cursor.start().0 + excerpt.header_height as usize;
(offset - cursor.start().0).saturating_sub(excerpt.header_height as usize); let mut end_before_newline = cursor.end(&()).0;
if excerpt.has_trailing_newline {
end_before_newline -= 1;
}
let buffer_start = excerpt.range.start.to_offset(&excerpt.buffer); let buffer_start = excerpt.range.start.to_offset(&excerpt.buffer);
let overshoot = cmp::min(offset, end_before_newline).saturating_sub(start_after_header);
Anchor { Anchor {
excerpt_id: excerpt.id.clone(), excerpt_id: excerpt.id.clone(),
text_anchor: excerpt.buffer.anchor_at(buffer_start + overshoot, bias), text_anchor: excerpt.buffer.anchor_at(buffer_start + overshoot, bias),