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

Treat multibuffer edit events properly

Browse source 
Miltibuffer emits edit events even if it only got an excerpt
added/removed/etc.
Separate buffer edits and trigger hint invalidation refresh for them
only, also trigger hint new lines refresh on excerpt addition events.
This commit is contained in:
Kirill Bulatov 2023-08-26 14:13:21 +03:00
parent 3fc48fc277
commit 48659d3b3c
2 changed files with 65 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

67
crates/editor/src/editor.rs
View file

@ -7896,7 +7896,9 @@ impl Editor {
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) { ) {
match event { match event {
multi_buffer::Event::Edited => { multi_buffer::Event::Edited {
sigleton_buffer_edited,
} => {
self.refresh_active_diagnostics(cx); self.refresh_active_diagnostics(cx);
self.refresh_code_actions(cx); self.refresh_code_actions(cx);
if self.has_active_copilot_suggestion(cx) { if self.has_active_copilot_suggestion(cx) {
@ -7904,30 +7906,32 @@ impl Editor {
} }
cx.emit(Event::BufferEdited); cx.emit(Event::BufferEdited);
if let Some(project) = &self.project { if *sigleton_buffer_edited {
let project = project.read(cx); if let Some(project) = &self.project {
let languages_affected = multibuffer let project = project.read(cx);
.read(cx) let languages_affected = multibuffer
.all_buffers() .read(cx)
.into_iter() .all_buffers()
.filter_map(|buffer| { .into_iter()
let buffer = buffer.read(cx); .filter_map(|buffer| {
let language = buffer.language()?; let buffer = buffer.read(cx);
if project.is_local() let language = buffer.language()?;
&& project.language_servers_for_buffer(buffer, cx).count() == 0 if project.is_local()
{ && project.language_servers_for_buffer(buffer, cx).count() == 0
None {
} else { None
Some(language) } else {
} Some(language)
}) }
.cloned() })
.collect::<HashSet<_>>(); .cloned()
if !languages_affected.is_empty() { .collect::<HashSet<_>>();
self.refresh_inlay_hints( if !languages_affected.is_empty() {
InlayHintRefreshReason::BufferEdited(languages_affected), self.refresh_inlay_hints(
cx, InlayHintRefreshReason::BufferEdited(languages_affected),
); cx,
);
}
} }
} }
} }
@ -7935,11 +7939,14 @@ impl Editor {
buffer, buffer,
predecessor, predecessor,
excerpts, excerpts,
} => cx.emit(Event::ExcerptsAdded { } => {
buffer: buffer.clone(), cx.emit(Event::ExcerptsAdded {
predecessor: *predecessor, buffer: buffer.clone(),
excerpts: excerpts.clone(), predecessor: *predecessor,
}), excerpts: excerpts.clone(),
});
self.refresh_inlay_hints(InlayHintRefreshReason::NewLinesShown, cx);
}
multi_buffer::Event::ExcerptsRemoved { ids } => { multi_buffer::Event::ExcerptsRemoved { ids } => {
cx.emit(Event::ExcerptsRemoved { ids: ids.clone() }) cx.emit(Event::ExcerptsRemoved { ids: ids.clone() })
} }

36
crates/editor/src/multi_buffer.rs
View file

@ -67,7 +67,9 @@ pub enum Event {
ExcerptsEdited { ExcerptsEdited {
ids: Vec<ExcerptId>, ids: Vec<ExcerptId>,
}, },
Edited, Edited {
sigleton_buffer_edited: bool,
},
Reloaded, Reloaded,
DiffBaseChanged, DiffBaseChanged,
LanguageChanged, LanguageChanged,
@ -1022,7 +1024,9 @@ impl MultiBuffer {
old: edit_start..edit_start, old: edit_start..edit_start,
new: edit_start..edit_end, new: edit_start..edit_end,
}]); }]);
cx.emit(Event::Edited); cx.emit(Event::Edited {
sigleton_buffer_edited: false,
});
cx.emit(Event::ExcerptsAdded { cx.emit(Event::ExcerptsAdded {
buffer, buffer,
predecessor: prev_excerpt_id, predecessor: prev_excerpt_id,
@ -1046,7 +1050,9 @@ impl MultiBuffer {
old: 0..prev_len, old: 0..prev_len,
new: 0..0, new: 0..0,
}]); }]);
cx.emit(Event::Edited); cx.emit(Event::Edited {
sigleton_buffer_edited: false,
});
cx.emit(Event::ExcerptsRemoved { ids }); cx.emit(Event::ExcerptsRemoved { ids });
cx.notify(); cx.notify();
} }
@ -1254,7 +1260,9 @@ impl MultiBuffer {
} }
self.subscriptions.publish_mut(edits); self.subscriptions.publish_mut(edits);
cx.emit(Event::Edited); cx.emit(Event::Edited {
sigleton_buffer_edited: false,
});
cx.emit(Event::ExcerptsRemoved { ids }); cx.emit(Event::ExcerptsRemoved { ids });
cx.notify(); cx.notify();
} }
@ -1315,7 +1323,9 @@ impl MultiBuffer {
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) { ) {
cx.emit(match event { cx.emit(match event {
language::Event::Edited => Event::Edited, language::Event::Edited => Event::Edited {
sigleton_buffer_edited: true,
},
language::Event::DirtyChanged => Event::DirtyChanged, language::Event::DirtyChanged => Event::DirtyChanged,
language::Event::Saved => Event::Saved, language::Event::Saved => Event::Saved,
language::Event::FileHandleChanged => Event::FileHandleChanged, language::Event::FileHandleChanged => Event::FileHandleChanged,
@ -4078,7 +4088,7 @@ mod tests {
multibuffer.update(cx, |_, cx| { multibuffer.update(cx, |_, cx| {
let events = events.clone(); let events = events.clone();
cx.subscribe(&multibuffer, move |_, _, event, _| { cx.subscribe(&multibuffer, move |_, _, event, _| {
if let Event::Edited = event { if let Event::Edited { .. } = event {
events.borrow_mut().push(event.clone()) events.borrow_mut().push(event.clone())
} }
}) })
@ -4133,7 +4143,17 @@ mod tests {
// Adding excerpts emits an edited event. // Adding excerpts emits an edited event.
assert_eq!( assert_eq!(
events.borrow().as_slice(), events.borrow().as_slice(),
&[Event::Edited, Event::Edited, Event::Edited] &[
Event::Edited {
sigleton_buffer_edited: false
},
Event::Edited {
sigleton_buffer_edited: false
},
Event::Edited {
sigleton_buffer_edited: false
}
]
); );
let snapshot = multibuffer.read(cx).snapshot(cx); let snapshot = multibuffer.read(cx).snapshot(cx);
@ -4312,7 +4332,7 @@ mod tests {
excerpts, excerpts,
} => follower.insert_excerpts_with_ids_after(predecessor, buffer, excerpts, cx), } => follower.insert_excerpts_with_ids_after(predecessor, buffer, excerpts, cx),
Event::ExcerptsRemoved { ids } => follower.remove_excerpts(ids, cx), Event::ExcerptsRemoved { ids } => follower.remove_excerpts(ids, cx),
Event::Edited => { Event::Edited { .. } => {
*follower_edit_event_count.borrow_mut() += 1; *follower_edit_event_count.borrow_mut() += 1;
} }
_ => {} _ => {}