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

Properly generate ranges to query

Browse source
This commit is contained in:
Kirill Bulatov 2023-08-11 23:06:57 +03:00
parent 56f89739f8
commit 449c009639
2 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

71
crates/editor/src/inlay_hint_cache.rs
View file

@ -96,14 +96,55 @@ impl TasksForRanges {
) { ) {
let ranges_to_query = match invalidate { let ranges_to_query = match invalidate {
InvalidationStrategy::None => { InvalidationStrategy::None => {
// let mut ranges_to_query = Vec::new(); let mut ranges_to_query = Vec::new();
let mut last_cache_range_stop = None::<language::Anchor>;
for cached_range in self
.ranges
.iter()
.skip_while(|cached_range| {
cached_range
.end
.cmp(&query_range.start, buffer_snapshot)
.is_lt()
})
.take_while(|cached_range| {
cached_range
.start
.cmp(&query_range.end, buffer_snapshot)
.is_le()
})
{
match last_cache_range_stop {
Some(last_cache_range_stop) => {
if last_cache_range_stop.offset.saturating_add(1)
< cached_range.start.offset
{
ranges_to_query.push(last_cache_range_stop..cached_range.start);
}
}
None => {
if query_range
.start
.cmp(&cached_range.start, buffer_snapshot)
.is_lt()
{
ranges_to_query.push(query_range.start..cached_range.start);
}
}
}
last_cache_range_stop = Some(cached_range.end);
}
// todo!("TODO kb also remove task ranges on invalidation"); match last_cache_range_stop {
// if ranges_to_query.is_empty() { Some(last_cache_range_stop) => {
// return; if last_cache_range_stop.offset.saturating_add(1) < query_range.end.offset {
// } ranges_to_query.push(last_cache_range_stop..query_range.end);
// ranges_to_query }
vec![query_range] }
None => ranges_to_query.push(query_range),
}
ranges_to_query
} }
InvalidationStrategy::RefreshRequested | InvalidationStrategy::BufferEdited => { InvalidationStrategy::RefreshRequested | InvalidationStrategy::BufferEdited => {
self.tasks.clear(); self.tasks.clear();
@ -112,10 +153,12 @@ impl TasksForRanges {
} }
}; };
self.ranges.extend(ranges_to_query.clone()); if !ranges_to_query.is_empty() {
self.ranges self.ranges.extend(ranges_to_query.clone());
.sort_by(|range_a, range_b| range_a.start.cmp(&range_b.start, buffer_snapshot)); self.ranges
self.tasks.push(spawn_task(ranges_to_query)); .sort_by(|range_a, range_b| range_a.start.cmp(&range_b.start, buffer_snapshot));
self.tasks.push(spawn_task(ranges_to_query));
}
} }
} }
@ -462,7 +505,11 @@ fn determine_query_range(
.min(full_excerpt_range.end.offset) .min(full_excerpt_range.end.offset)
.min(buffer.len()), .min(buffer.len()),
); );
Some(start..end) if start.cmp(&end, buffer).is_eq() {
None
} else {
Some(start..end)
}
} }
fn new_update_task( fn new_update_task(

1
crates/editor/src/scroll.rs
View file

@ -333,7 +333,6 @@ impl Editor {
cx, cx,
); );
// TODO kb too many events + too many LSP requests even due to deduplication, why?
self.refresh_inlays(InlayRefreshReason::NewLinesShown, cx); self.refresh_inlays(InlayRefreshReason::NewLinesShown, cx);
} }