mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Remove FullOffset

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-04 12:34:35 +02:00
parent eaf09463be
commit f016400ddc
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -352,7 +352,7 @@ pub struct FragmentSummary {
max_insertion_version: time::Global,
}
#[derive(Default, Clone, Debug, PartialEq, Eq)]
#[derive(Copy, Default, Clone, Debug, PartialEq, Eq)]
struct FragmentTextSummary {
visible: usize,
deleted: usize,
@ -1621,7 +1621,10 @@ impl Buffer {
fn full_offset_for_anchor(&self, anchor: &Anchor) -> usize {
match anchor {
Anchor::Start => 0,
Anchor::End => self.fragments.extent::<FullOffset>(&None).0,
Anchor::End => {
let summary = self.fragments.summary();
summary.text.visible + summary.text.deleted
}
Anchor::Middle {
offset,
bias,
@ -1629,14 +1632,15 @@ impl Buffer {
} => {
let mut cursor = self
.fragments
.cursor::<VersionedOffset, (VersionedOffset, FullOffset)>();
.cursor::<VersionedOffset, (VersionedOffset, FragmentTextSummary)>();
cursor.seek(
&VersionedOffset::Offset(*offset),
bias.to_seek_bias(),
&Some(version.clone()),
);
let full_offset = cursor.start().1;
full_offset.0 + offset - cursor.start().0.offset()
let overshoot = offset - cursor.start().0.offset();
let summary = cursor.start().1;
summary.visible + summary.deleted + overshoot
}
}
}
@ -2135,15 +2139,6 @@ where
}
}
#[derive(Clone, Copy, Debug, Default)]
struct FullOffset(usize);
impl<'a> sum_tree::Dimension<'a, FragmentSummary> for FullOffset {
fn add_summary(&mut self, summary: &'a FragmentSummary, _: &Option<time::Global>) {
self.0 += summary.text.visible + summary.text.deleted;
}
}
impl Operation {
fn replica_id(&self) -> ReplicaId {
self.lamport_timestamp().replica_id