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

Fix Global::gt and rename it to changed_since

Browse source 
A false negative return value of `gt` was preventing guests' multibuffers from
syncing correctly.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-01-05 17:36:12 -08:00
parent 4b22e49ce1
commit e5faaeb2f2
4 changed files with 41 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/text/src/text.rs
View file

@ -1125,8 +1125,8 @@ impl Buffer {
false
} else {
match op {
Operation::Edit(edit) => self.version.ge(&edit.version),
Operation::Undo { undo, .. } => self.version.ge(&undo.version),
Operation::Edit(edit) => self.version.observed_all(&edit.version),
Operation::Undo { undo, .. } => self.version.observed_all(&undo.version),
}
}
}
@ -1648,10 +1648,10 @@ impl BufferSnapshot {
let fragments_cursor = if *since == self.version {
None
} else {
Some(
self.fragments
.filter(move |summary| !since.ge(&summary.max_version), &None),
)
Some(self.fragments.filter(
move |summary| !since.observed_all(&summary.max_version),
&None,
))
};
let mut cursor = self
.fragments
@ -2025,7 +2025,7 @@ impl<'a> sum_tree::Dimension<'a, FragmentSummary> for VersionedFullOffset {
fn add_summary(&mut self, summary: &'a FragmentSummary, cx: &Option<clock::Global>) {
if let Self::Offset(offset) = self {
let version = cx.as_ref().unwrap();
if version.ge(&summary.max_insertion_version) {
if version.observed_all(&summary.max_insertion_version) {
*offset += summary.text.visible + summary.text.deleted;
} else if version.observed_any(&summary.min_insertion_version) {
*self = Self::Invalid;