Properly omit throttled hint queries

This commit is contained in:
Kirill Bulatov 2023-08-26 21:12:04 +03:00
parent 851d74d5e1
commit 73937876b6

View File

@ -877,10 +877,8 @@ async fn fetch_and_update_hints(
let inlay_hints_fetch_task = editor let inlay_hints_fetch_task = editor
.update(&mut cx, |editor, cx| { .update(&mut cx, |editor, cx| {
if got_throttled { if got_throttled {
if let Some((_, _, current_visible_range)) = editor let query_not_around_visible_range = match editor.excerpt_visible_offsets(None, cx).remove(&query.excerpt_id) {
.excerpt_visible_offsets(None, cx) Some((_, _, current_visible_range)) => {
.remove(&query.excerpt_id)
{
let visible_offset_length = current_visible_range.len(); let visible_offset_length = current_visible_range.len();
let double_visible_range = current_visible_range let double_visible_range = current_visible_range
.start .start
@ -889,11 +887,14 @@ async fn fetch_and_update_hints(
.end .end
.saturating_add(visible_offset_length) .saturating_add(visible_offset_length)
.min(buffer_snapshot.len()); .min(buffer_snapshot.len());
if !double_visible_range !double_visible_range
.contains(&fetch_range.start.to_offset(&buffer_snapshot)) .contains(&fetch_range.start.to_offset(&buffer_snapshot))
&& !double_visible_range && !double_visible_range
.contains(&fetch_range.end.to_offset(&buffer_snapshot)) .contains(&fetch_range.end.to_offset(&buffer_snapshot))
{ },
None => true,
};
if query_not_around_visible_range {
log::trace!("Fetching inlay hints for range {fetch_range_to_log:?} got throttled and fell off the current visible range, skipping."); log::trace!("Fetching inlay hints for range {fetch_range_to_log:?} got throttled and fell off the current visible range, skipping.");
if let Some(task_ranges) = editor if let Some(task_ranges) = editor
.inlay_hint_cache .inlay_hint_cache
@ -905,7 +906,6 @@ async fn fetch_and_update_hints(
return None; return None;
} }
} }
}
editor editor
.buffer() .buffer()
.read(cx) .read(cx)