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

7
crates/language/src/buffer.rs
View file

@ -725,7 +725,8 @@ impl Buffer {
let grammar_changed = this
.grammar()
.map_or(true, |curr_grammar| !Arc::ptr_eq(&grammar, curr_grammar));
let parse_again = this.version.gt(&parsed_version) || grammar_changed;
let parse_again =
this.version.changed_since(&parsed_version) || grammar_changed;
this.parsing_in_background = false;
this.did_finish_parsing(new_tree, parsed_version, cx);
@ -1095,12 +1096,12 @@ impl Buffer {
}
pub fn is_dirty(&self) -> bool {
!self.saved_version.ge(&self.version)
!self.saved_version.observed_all(&self.version)
|| self.file.as_ref().map_or(false, |file| file.is_deleted())
}
pub fn has_conflict(&self) -> bool {
!self.saved_version.ge(&self.version)
!self.saved_version.observed_all(&self.version)
&& self
.file
.as_ref()