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

WIP: Compare anchors without using FragmentId

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-01 17:54:55 +02:00
parent b3f13ce325
commit df13cf0a90
2 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
zed/src/editor/buffer.rs
View file

@ -353,6 +353,7 @@ pub struct FragmentSummary {
max_version: time::Global,
min_insertion_version: time::Global,
max_insertion_version: time::Global,
count: usize,
}
#[derive(Default, Clone, Debug, PartialEq, Eq)]
@ -2029,6 +2030,26 @@ impl Buffer {
}
}
fn fragment_ix_for_anchor(&self, anchor: &Anchor) -> usize {
match anchor {
Anchor::Start => 0,
Anchor::End => self.fragments.extent::<FragmentCount>(&None).0,
Anchor::Middle {
offset,
bias,
version,
} => {
let mut cursor = self.fragments.cursor::<VersionedOffset, FragmentCount>();
cursor.seek(
&VersionedOffset::Offset(*offset),
bias.to_seek_bias(),
&Some(version.clone()),
);
cursor.start().0
}
}
}
pub fn point_for_offset(&self, offset: usize) -> Result<Point> {
if offset <= self.len() {
Ok(self.text_summary_for_range(0..offset).lines)
@ -2503,6 +2524,7 @@ impl sum_tree::Item for Fragment {
max_version,
min_insertion_version,
max_insertion_version,
count: 1,
}
} else {
FragmentSummary {
@ -2514,6 +2536,7 @@ impl sum_tree::Item for Fragment {
max_version,
min_insertion_version,
max_insertion_version,
count: 1,
}
}
}
@ -2532,6 +2555,7 @@ impl sum_tree::Summary for FragmentSummary {
.meet(&other.min_insertion_version);
self.max_insertion_version
.join(&other.max_insertion_version);
self.count += other.count;
}
}
@ -2543,6 +2567,7 @@ impl Default for FragmentSummary {
max_version: time::Global::new(),
min_insertion_version: time::Global::new(),
max_insertion_version: time::Global::new(),
count: 0,
}
}
}
@ -2641,6 +2666,15 @@ impl<'a> sum_tree::Dimension<'a, FragmentSummary> for (VersionedOffset, usize) {
}
}
#[derive(Copy, Clone, Default, Debug, Eq, PartialEq, Ord, PartialOrd)]
struct FragmentCount(usize);
impl<'a> sum_tree::Dimension<'a, FragmentSummary> for FragmentCount {
fn add_summary(&mut self, summary: &'a FragmentSummary, _: &Option<time::Global>) {
self.0 += summary.count;
}
}
impl Operation {
fn replica_id(&self) -> ReplicaId {
self.lamport_timestamp().replica_id

24
zed/src/editor/buffer/anchor.rs
View file

@ -63,21 +63,27 @@ impl Anchor {
Anchor::Middle {
offset: self_offset,
bias: self_bias,
version: self_version,
..
},
Anchor::Middle {
offset: other_offset,
bias: other_bias,
version: other_version,
..
},
) => {
let offset_comparison = if self_version == other_version {
self_offset.cmp(other_offset)
} else {
self.to_offset(buffer).cmp(&other.to_offset(buffer))
};
offset_comparison.then_with(|| self_bias.cmp(other_bias))
dbg!(
self,
other,
self_offset,
other_offset,
buffer.fragment_ix_for_anchor(self),
buffer.fragment_ix_for_anchor(other)
);
buffer
.fragment_ix_for_anchor(self)
.cmp(&buffer.fragment_ix_for_anchor(other))
.then_with(|| self_offset.cmp(&other_offset))
.then_with(|| self_bias.cmp(other_bias))
}
})
}