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

Respect excerpt's range when comparing two anchors both belonging to it

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-11 12:41:05 +01:00
parent a067150b5a
commit c67cfd7fe1
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1998,10 +1998,9 @@ impl MultiBufferSnapshot {
pub fn can_resolve(&self, anchor: &Anchor) -> bool {
if anchor.excerpt_id == ExcerptId::min() || anchor.excerpt_id == ExcerptId::max() {
true
} else if let Some((buffer_id, buffer_snapshot)) =
self.buffer_snapshot_for_excerpt(&anchor.excerpt_id)
{
anchor.buffer_id == Some(buffer_id) && buffer_snapshot.can_resolve(&anchor.text_anchor)
} else if let Some(excerpt) = self.excerpt(&anchor.excerpt_id) {
anchor.buffer_id == Some(excerpt.buffer_id)
&& excerpt.buffer.can_resolve(&anchor.text_anchor)
} else {
false
}
@ -2231,15 +2230,12 @@ impl MultiBufferSnapshot {
))
}
fn buffer_snapshot_for_excerpt<'a>(
&'a self,
excerpt_id: &'a ExcerptId,
) -> Option<(usize, &'a BufferSnapshot)> {
fn excerpt<'a>(&'a self, excerpt_id: &'a ExcerptId) -> Option<&'a Excerpt> {
let mut cursor = self.excerpts.cursor::<Option<&ExcerptId>>();
cursor.seek(&Some(excerpt_id), Bias::Left, &());
if let Some(excerpt) = cursor.item() {
if excerpt.id == *excerpt_id {
return Some((excerpt.buffer_id, &excerpt.buffer));
return Some(excerpt);
}
}
None