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

Fix more inlay_map corner cases and hangings

Browse source 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Kirill Bulatov 2023-06-14 18:59:27 +03:00
parent 02e124cec4
commit bec9c26fa2
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/editor/src/display_map/inlay_map.rs
View file

@ -253,7 +253,7 @@ impl InlayMap {
pub fn sync( pub fn sync(
&mut self, &mut self,
suggestion_snapshot: SuggestionSnapshot, suggestion_snapshot: SuggestionSnapshot,
suggestion_edits: Vec<SuggestionEdit>, mut suggestion_edits: Vec<SuggestionEdit>,
) -> (InlaySnapshot, Vec<InlayEdit>) { ) -> (InlaySnapshot, Vec<InlayEdit>) {
let mut snapshot = self.snapshot.lock(); let mut snapshot = self.snapshot.lock();
@ -262,6 +262,22 @@ impl InlayMap {
new_snapshot.version += 1; new_snapshot.version += 1;
} }
if suggestion_snapshot
.buffer_snapshot()
.trailing_excerpt_update_count()
!= snapshot
.suggestion_snapshot
.buffer_snapshot()
.trailing_excerpt_update_count()
{
if suggestion_edits.is_empty() {
suggestion_edits.push(Edit {
old: snapshot.suggestion_snapshot.len()..snapshot.suggestion_snapshot.len(),
new: suggestion_snapshot.len()..suggestion_snapshot.len(),
});
}
}
let mut inlay_edits = Patch::default(); let mut inlay_edits = Patch::default();
let mut new_transforms = SumTree::new(); let mut new_transforms = SumTree::new();
let mut cursor = snapshot let mut cursor = snapshot
@ -393,7 +409,8 @@ impl InlayMap {
to_remove: Vec<InlayId>, to_remove: Vec<InlayId>,
to_insert: Vec<(InlayId, InlayProperties<T>)>, to_insert: Vec<(InlayId, InlayProperties<T>)>,
) -> (InlaySnapshot, Vec<InlayEdit>) { ) -> (InlaySnapshot, Vec<InlayEdit>) {
let snapshot = self.snapshot.lock(); let mut snapshot = self.snapshot.lock();
snapshot.version += 1;
let mut edits = BTreeSet::new(); let mut edits = BTreeSet::new();
for (id, properties) in to_insert { for (id, properties) in to_insert {

13
crates/editor/src/multi_buffer/anchor.rs
View file

@ -90,15 +90,10 @@ impl Anchor {
if *self == Anchor::min() || *self == Anchor::max() { if *self == Anchor::min() || *self == Anchor::max() {
true true
} else if let Some(excerpt) = snapshot.excerpt(self.excerpt_id) { } else if let Some(excerpt) = snapshot.excerpt(self.excerpt_id) {
self.text_anchor.is_valid(&excerpt.buffer) excerpt.contains(self)
&& self && (self.text_anchor == excerpt.range.context.start
.text_anchor || self.text_anchor == excerpt.range.context.end
.cmp(&excerpt.range.context.start, &excerpt.buffer) || self.text_anchor.is_valid(&excerpt.buffer))
.is_ge()
&& self
.text_anchor
.cmp(&excerpt.range.context.end, &excerpt.buffer)
.is_le()
} else { } else {
false false
} }