Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always use seek_forward when resolving anchors

Browse source
This commit is contained in:
Antonio Scandurra 2021-10-11 09:37:21 +02:00
parent 6531df2368
commit b43c78053b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/buffer/src/lib.rs
View file

@ -2670,7 +2670,7 @@ impl<'a> Content<'a> {
let mut rope_cursor = self.visible_text.cursor(0); let mut rope_cursor = self.visible_text.cursor(0);
let mut cursor = self.fragments.cursor::<(VersionedOffset, usize)>(); let mut cursor = self.fragments.cursor::<(VersionedOffset, usize)>();
map.entries.iter().map(move |((offset, bias), value)| { map.entries.iter().map(move |((offset, bias), value)| {
cursor.seek(&VersionedOffset::Offset(*offset), *bias, &cx); cursor.seek_forward(&VersionedOffset::Offset(*offset), *bias, &cx);
let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) { let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) {
offset - cursor.start().0.offset() offset - cursor.start().0.offset()
} else { } else {
@ -2695,7 +2695,7 @@ impl<'a> Content<'a> {
end: (end_offset, end_bias), end: (end_offset, end_bias),
} = range; } = range;
cursor.seek(&VersionedOffset::Offset(*start_offset), *start_bias, &cx); cursor.seek_forward(&VersionedOffset::Offset(*start_offset), *start_bias, &cx);
let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) { let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) {
start_offset - cursor.start().0.offset() start_offset - cursor.start().0.offset()
} else { } else {
@ -2704,7 +2704,7 @@ impl<'a> Content<'a> {
summary += rope_cursor.summary(cursor.start().1 + overshoot); summary += rope_cursor.summary(cursor.start().1 + overshoot);
let start_summary = summary.clone(); let start_summary = summary.clone();
cursor.seek(&VersionedOffset::Offset(*end_offset), *end_bias, &cx); cursor.seek_forward(&VersionedOffset::Offset(*end_offset), *end_bias, &cx);
let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) { let overshoot = if cursor.item().map_or(false, |fragment| fragment.visible) {
end_offset - cursor.start().0.offset() end_offset - cursor.start().0.offset()
} else { } else {