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

Draft the hint render data flow

Browse source
This commit is contained in:
Kirill Bulatov 2023-06-06 15:16:46 +03:00
parent 2ead3de7de
commit 4c3c0eb796
6 changed files with 103 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1169,11 +1169,19 @@ impl InlayHintState {
Self::first_timestamp_newer(timestamp, &current_timestamp)
}
fn update_if_newer(&self, new_hints: Vec<InlayHint>, new_timestamp: HashMap<usize, Global>) {
fn update_if_newer(
&self,
new_hints: Vec<InlayHint>,
new_timestamp: HashMap<usize, Global>,
) -> bool {
let mut guard = self.0.write();
if Self::first_timestamp_newer(&new_timestamp, &guard.0) {
guard.0 = new_timestamp;
guard.1 = new_hints;
true
} else {
false
}
}
@ -2688,7 +2696,7 @@ impl Editor {
let inlay_hints_storage = Arc::clone(&self.inlay_hints);
if inlay_hints_storage.is_newer(&new_timestamp) {
cx.spawn(|_, _| async move {
cx.spawn(|editor, mut cx| async move {
let mut new_hints = Vec::new();
for task_result in futures::future::join_all(hint_fetch_tasks).await {
match task_result {
@ -2696,7 +2704,18 @@ impl Editor {
Err(e) => error!("Failed to update hints for buffer: {e:#}"),
}
}
inlay_hints_storage.update_if_newer(new_hints, new_timestamp);
// TODO kb another odd clone, can be avoid all this? hide hints behind a handle?
if inlay_hints_storage.update_if_newer(new_hints.clone(), new_timestamp) {
editor
.update(&mut cx, |editor, cx| {
editor.display_map.update(cx, |display_map, cx| {
display_map.set_inlay_hints(&new_hints, cx)
});
})
.log_err()
.unwrap_or(())
}
})
.detach();
}