use std::{ cmp, ops::{ControlFlow, Range}, sync::Arc, }; use crate::{ display_map::Inlay, Anchor, Editor, ExcerptId, InlayId, MultiBuffer, MultiBufferSnapshot, }; use anyhow::Context; use clock::Global; use gpui::{ModelHandle, Task, ViewContext}; use language::{language_settings::InlayHintKind, Buffer, BufferSnapshot}; use log::error; use parking_lot::RwLock; use project::InlayHint; use collections::{hash_map, HashMap, HashSet}; use language::language_settings::InlayHintSettings; use util::post_inc; pub struct InlayHintCache { pub hints: HashMap>>, pub allowed_hint_kinds: HashSet>, pub version: usize, pub enabled: bool, update_tasks: HashMap, } #[derive(Debug)] pub struct CachedExcerptHints { version: usize, buffer_version: Global, buffer_id: u64, pub hints: Vec<(InlayId, InlayHint)>, } #[derive(Debug, Clone, Copy)] pub enum InvalidationStrategy { RefreshRequested, BufferEdited, None, } #[derive(Debug, Default)] pub struct InlaySplice { pub to_remove: Vec, pub to_insert: Vec, } struct UpdateTask { invalidate: InvalidationStrategy, cache_version: usize, task: RunningTask, pending_refresh: Option, } struct RunningTask { _task: Task<()>, is_running_rx: smol::channel::Receiver<()>, } #[derive(Debug)] struct ExcerptHintsUpdate { excerpt_id: ExcerptId, remove_from_visible: Vec, remove_from_cache: HashSet, add_to_cache: HashSet, } #[derive(Debug, Clone, Copy)] struct ExcerptQuery { buffer_id: u64, excerpt_id: ExcerptId, dimensions: ExcerptDimensions, cache_version: usize, invalidate: InvalidationStrategy, } #[derive(Debug, Clone, Copy)] struct ExcerptDimensions { excerpt_range_start: language::Anchor, excerpt_range_end: language::Anchor, excerpt_visible_range_start: language::Anchor, excerpt_visible_range_end: language::Anchor, } struct HintFetchRanges { visible_range: Range, other_ranges: Vec>, } impl InvalidationStrategy { fn should_invalidate(&self) -> bool { matches!( self, InvalidationStrategy::RefreshRequested | InvalidationStrategy::BufferEdited ) } } impl ExcerptQuery { fn hints_fetch_ranges(&self, buffer: &BufferSnapshot) -> HintFetchRanges { let visible_range = self.dimensions.excerpt_visible_range_start..self.dimensions.excerpt_visible_range_end; let mut other_ranges = Vec::new(); if self .dimensions .excerpt_range_start .cmp(&visible_range.start, buffer) .is_lt() { let mut end = visible_range.start; end.offset -= 1; other_ranges.push(self.dimensions.excerpt_range_start..end); } if self .dimensions .excerpt_range_end .cmp(&visible_range.end, buffer) .is_gt() { let mut start = visible_range.end; start.offset += 1; other_ranges.push(start..self.dimensions.excerpt_range_end); } HintFetchRanges { visible_range, other_ranges: other_ranges.into_iter().map(|range| range).collect(), } } } impl InlayHintCache { pub fn new(inlay_hint_settings: InlayHintSettings) -> Self { Self { allowed_hint_kinds: inlay_hint_settings.enabled_inlay_hint_kinds(), enabled: inlay_hint_settings.enabled, hints: HashMap::default(), update_tasks: HashMap::default(), version: 0, } } pub fn update_settings( &mut self, multi_buffer: &ModelHandle, new_hint_settings: InlayHintSettings, visible_hints: Vec, cx: &mut ViewContext, ) -> ControlFlow> { let new_allowed_hint_kinds = new_hint_settings.enabled_inlay_hint_kinds(); match (self.enabled, new_hint_settings.enabled) { (false, false) => { self.allowed_hint_kinds = new_allowed_hint_kinds; ControlFlow::Break(None) } (true, true) => { if new_allowed_hint_kinds == self.allowed_hint_kinds { ControlFlow::Break(None) } else { let new_splice = self.new_allowed_hint_kinds_splice( multi_buffer, &visible_hints, &new_allowed_hint_kinds, cx, ); if new_splice.is_some() { self.version += 1; self.update_tasks.clear(); self.allowed_hint_kinds = new_allowed_hint_kinds; } ControlFlow::Break(new_splice) } } (true, false) => { self.enabled = new_hint_settings.enabled; self.allowed_hint_kinds = new_allowed_hint_kinds; if self.hints.is_empty() { ControlFlow::Break(None) } else { self.clear(); ControlFlow::Break(Some(InlaySplice { to_remove: visible_hints.iter().map(|inlay| inlay.id).collect(), to_insert: Vec::new(), })) } } (false, true) => { self.enabled = new_hint_settings.enabled; self.allowed_hint_kinds = new_allowed_hint_kinds; ControlFlow::Continue(()) } } } pub fn spawn_hint_refresh( &mut self, mut excerpts_to_query: HashMap, Global, Range)>, invalidate: InvalidationStrategy, cx: &mut ViewContext, ) -> Option { if !self.enabled { return None; } let update_tasks = &mut self.update_tasks; let mut invalidated_hints = Vec::new(); if invalidate.should_invalidate() { let mut changed = false; update_tasks.retain(|task_excerpt_id, _| { let retain = excerpts_to_query.contains_key(task_excerpt_id); changed |= !retain; retain }); self.hints.retain(|cached_excerpt, cached_hints| { let retain = excerpts_to_query.contains_key(cached_excerpt); changed |= !retain; if !retain { invalidated_hints.extend(cached_hints.read().hints.iter().map(|&(id, _)| id)); } retain }); if changed { self.version += 1; } } if excerpts_to_query.is_empty() && invalidated_hints.is_empty() { return None; } let cache_version = self.version; excerpts_to_query.retain(|visible_excerpt_id, _| { match update_tasks.entry(*visible_excerpt_id) { hash_map::Entry::Occupied(o) => match o.get().cache_version.cmp(&cache_version) { cmp::Ordering::Less => true, cmp::Ordering::Equal => invalidate.should_invalidate(), cmp::Ordering::Greater => false, }, hash_map::Entry::Vacant(_) => true, } }); cx.spawn(|editor, mut cx| async move { editor .update(&mut cx, |editor, cx| { spawn_new_update_tasks(editor, excerpts_to_query, invalidate, cache_version, cx) }) .ok(); }) .detach(); if invalidated_hints.is_empty() { None } else { Some(InlaySplice { to_remove: invalidated_hints, to_insert: Vec::new(), }) } } fn new_allowed_hint_kinds_splice( &self, multi_buffer: &ModelHandle, visible_hints: &[Inlay], new_kinds: &HashSet>, cx: &mut ViewContext, ) -> Option { let old_kinds = &self.allowed_hint_kinds; if new_kinds == old_kinds { return None; } let mut to_remove = Vec::new(); let mut to_insert = Vec::new(); let mut shown_hints_to_remove = visible_hints.iter().fold( HashMap::>::default(), |mut current_hints, inlay| { current_hints .entry(inlay.position.excerpt_id) .or_default() .push((inlay.position, inlay.id)); current_hints }, ); let multi_buffer = multi_buffer.read(cx); let multi_buffer_snapshot = multi_buffer.snapshot(cx); for (excerpt_id, excerpt_cached_hints) in &self.hints { let shown_excerpt_hints_to_remove = shown_hints_to_remove.entry(*excerpt_id).or_default(); let excerpt_cached_hints = excerpt_cached_hints.read(); let mut excerpt_cache = excerpt_cached_hints.hints.iter().fuse().peekable(); shown_excerpt_hints_to_remove.retain(|(shown_anchor, shown_hint_id)| { let Some(buffer) = shown_anchor .buffer_id .and_then(|buffer_id| multi_buffer.buffer(buffer_id)) else { return false }; let buffer_snapshot = buffer.read(cx).snapshot(); loop { match excerpt_cache.peek() { Some((cached_hint_id, cached_hint)) => { if cached_hint_id == shown_hint_id { excerpt_cache.next(); return !new_kinds.contains(&cached_hint.kind); } match cached_hint .position .cmp(&shown_anchor.text_anchor, &buffer_snapshot) { cmp::Ordering::Less | cmp::Ordering::Equal => { if !old_kinds.contains(&cached_hint.kind) && new_kinds.contains(&cached_hint.kind) { to_insert.push(Inlay::hint( cached_hint_id.id(), multi_buffer_snapshot.anchor_in_excerpt( *excerpt_id, cached_hint.position, ), &cached_hint, )); } excerpt_cache.next(); } cmp::Ordering::Greater => return true, } } None => return true, } } }); for (cached_hint_id, maybe_missed_cached_hint) in excerpt_cache { let cached_hint_kind = maybe_missed_cached_hint.kind; if !old_kinds.contains(&cached_hint_kind) && new_kinds.contains(&cached_hint_kind) { to_insert.push(Inlay::hint( cached_hint_id.id(), multi_buffer_snapshot .anchor_in_excerpt(*excerpt_id, maybe_missed_cached_hint.position), &maybe_missed_cached_hint, )); } } } to_remove.extend( shown_hints_to_remove .into_values() .flatten() .map(|(_, hint_id)| hint_id), ); if to_remove.is_empty() && to_insert.is_empty() { None } else { Some(InlaySplice { to_remove, to_insert, }) } } fn clear(&mut self) { self.version += 1; self.update_tasks.clear(); self.hints.clear(); } } fn spawn_new_update_tasks( editor: &mut Editor, excerpts_to_query: HashMap, Global, Range)>, invalidate: InvalidationStrategy, update_cache_version: usize, cx: &mut ViewContext<'_, '_, Editor>, ) { let visible_hints = Arc::new(editor.visible_inlay_hints(cx)); for (excerpt_id, (buffer_handle, new_task_buffer_version, excerpt_visible_range)) in excerpts_to_query { if excerpt_visible_range.is_empty() { continue; } let buffer = buffer_handle.read(cx); let buffer_snapshot = buffer.snapshot(); if buffer_snapshot .version() .changed_since(&new_task_buffer_version) { continue; } let cached_excerpt_hints = editor.inlay_hint_cache.hints.get(&excerpt_id).cloned(); if let Some(cached_excerpt_hints) = &cached_excerpt_hints { let cached_excerpt_hints = cached_excerpt_hints.read(); let cached_buffer_version = &cached_excerpt_hints.buffer_version; if cached_excerpt_hints.version > update_cache_version || cached_buffer_version.changed_since(&new_task_buffer_version) { continue; } if !new_task_buffer_version.changed_since(&cached_buffer_version) && !matches!(invalidate, InvalidationStrategy::RefreshRequested) { continue; } }; let buffer_id = buffer.remote_id(); let excerpt_visible_range_start = buffer.anchor_before(excerpt_visible_range.start); let excerpt_visible_range_end = buffer.anchor_after(excerpt_visible_range.end); let (multi_buffer_snapshot, full_excerpt_range) = editor.buffer.update(cx, |multi_buffer, cx| { let multi_buffer_snapshot = multi_buffer.snapshot(cx); ( multi_buffer_snapshot, multi_buffer .excerpts_for_buffer(&buffer_handle, cx) .into_iter() .find(|(id, _)| id == &excerpt_id) .map(|(_, range)| range.context), ) }); if let Some(full_excerpt_range) = full_excerpt_range { let query = ExcerptQuery { buffer_id, excerpt_id, dimensions: ExcerptDimensions { excerpt_range_start: full_excerpt_range.start, excerpt_range_end: full_excerpt_range.end, excerpt_visible_range_start, excerpt_visible_range_end, }, cache_version: update_cache_version, invalidate, }; let new_update_task = |is_refresh_after_regular_task| { new_update_task( query, multi_buffer_snapshot, buffer_snapshot, Arc::clone(&visible_hints), cached_excerpt_hints, is_refresh_after_regular_task, cx, ) }; match editor.inlay_hint_cache.update_tasks.entry(excerpt_id) { hash_map::Entry::Occupied(mut o) => { let update_task = o.get_mut(); match (update_task.invalidate, invalidate) { (_, InvalidationStrategy::None) => {} ( InvalidationStrategy::BufferEdited, InvalidationStrategy::RefreshRequested, ) if !update_task.task.is_running_rx.is_closed() => { update_task.pending_refresh = Some(query); } _ => { o.insert(UpdateTask { invalidate, cache_version: query.cache_version, task: new_update_task(false), pending_refresh: None, }); } } } hash_map::Entry::Vacant(v) => { v.insert(UpdateTask { invalidate, cache_version: query.cache_version, task: new_update_task(false), pending_refresh: None, }); } } } } } fn new_update_task( query: ExcerptQuery, multi_buffer_snapshot: MultiBufferSnapshot, buffer_snapshot: BufferSnapshot, visible_hints: Arc>, cached_excerpt_hints: Option>>, is_refresh_after_regular_task: bool, cx: &mut ViewContext<'_, '_, Editor>, ) -> RunningTask { let hints_fetch_ranges = query.hints_fetch_ranges(&buffer_snapshot); let (is_running_tx, is_running_rx) = smol::channel::bounded(1); let _task = cx.spawn(|editor, mut cx| async move { let _is_running_tx = is_running_tx; let create_update_task = |range| { fetch_and_update_hints( editor.clone(), multi_buffer_snapshot.clone(), buffer_snapshot.clone(), Arc::clone(&visible_hints), cached_excerpt_hints.as_ref().map(Arc::clone), query, range, cx.clone(), ) }; if is_refresh_after_regular_task { let visible_range_has_updates = match create_update_task(hints_fetch_ranges.visible_range).await { Ok(updated) => updated, Err(e) => { error!("inlay hint visible range update task failed: {e:#}"); return; } }; if visible_range_has_updates { let other_update_results = futures::future::join_all( hints_fetch_ranges .other_ranges .into_iter() .map(create_update_task), ) .await; for result in other_update_results { if let Err(e) = result { error!("inlay hint update task failed: {e:#}"); } } } } else { let task_update_results = futures::future::join_all( std::iter::once(hints_fetch_ranges.visible_range) .chain(hints_fetch_ranges.other_ranges.into_iter()) .map(create_update_task), ) .await; for result in task_update_results { if let Err(e) = result { error!("inlay hint update task failed: {e:#}"); } } } editor .update(&mut cx, |editor, cx| { let pending_refresh_query = editor .inlay_hint_cache .update_tasks .get_mut(&query.excerpt_id) .and_then(|task| task.pending_refresh.take()); if let Some(pending_refresh_query) = pending_refresh_query { let refresh_multi_buffer = editor.buffer().read(cx); let refresh_multi_buffer_snapshot = refresh_multi_buffer.snapshot(cx); let refresh_visible_hints = Arc::new(editor.visible_inlay_hints(cx)); let refresh_cached_excerpt_hints = editor .inlay_hint_cache .hints .get(&pending_refresh_query.excerpt_id) .map(Arc::clone); if let Some(buffer) = refresh_multi_buffer.buffer(pending_refresh_query.buffer_id) { drop(refresh_multi_buffer); editor.inlay_hint_cache.update_tasks.insert( pending_refresh_query.excerpt_id, UpdateTask { invalidate: InvalidationStrategy::RefreshRequested, cache_version: editor.inlay_hint_cache.version, task: new_update_task( pending_refresh_query, refresh_multi_buffer_snapshot, buffer.read(cx).snapshot(), refresh_visible_hints, refresh_cached_excerpt_hints, true, cx, ), pending_refresh: None, }, ); } } }) .ok(); }); RunningTask { _task, is_running_rx, } } async fn fetch_and_update_hints( editor: gpui::WeakViewHandle, multi_buffer_snapshot: MultiBufferSnapshot, buffer_snapshot: BufferSnapshot, visible_hints: Arc>, cached_excerpt_hints: Option>>, query: ExcerptQuery, fetch_range: Range, mut cx: gpui::AsyncAppContext, ) -> anyhow::Result { let inlay_hints_fetch_task = editor .update(&mut cx, |editor, cx| { editor .buffer() .read(cx) .buffer(query.buffer_id) .and_then(|buffer| { let project = editor.project.as_ref()?; Some(project.update(cx, |project, cx| { project.inlay_hints(buffer, fetch_range.clone(), cx) })) }) }) .ok() .flatten(); let mut update_happened = false; let Some(inlay_hints_fetch_task) = inlay_hints_fetch_task else { return Ok(update_happened) }; let new_hints = inlay_hints_fetch_task .await .context("inlay hint fetch task")?; let background_task_buffer_snapshot = buffer_snapshot.clone(); let backround_fetch_range = fetch_range.clone(); let new_update = cx .background() .spawn(async move { calculate_hint_updates( query, backround_fetch_range, new_hints, &background_task_buffer_snapshot, cached_excerpt_hints, &visible_hints, ) }) .await; editor .update(&mut cx, |editor, cx| { if let Some(new_update) = new_update { update_happened = !new_update.add_to_cache.is_empty() || !new_update.remove_from_cache.is_empty() || !new_update.remove_from_visible.is_empty(); let cached_excerpt_hints = editor .inlay_hint_cache .hints .entry(new_update.excerpt_id) .or_insert_with(|| { Arc::new(RwLock::new(CachedExcerptHints { version: query.cache_version, buffer_version: buffer_snapshot.version().clone(), buffer_id: query.buffer_id, hints: Vec::new(), })) }); let mut cached_excerpt_hints = cached_excerpt_hints.write(); match query.cache_version.cmp(&cached_excerpt_hints.version) { cmp::Ordering::Less => return, cmp::Ordering::Greater | cmp::Ordering::Equal => { cached_excerpt_hints.version = query.cache_version; } } cached_excerpt_hints .hints .retain(|(hint_id, _)| !new_update.remove_from_cache.contains(hint_id)); cached_excerpt_hints.buffer_version = buffer_snapshot.version().clone(); editor.inlay_hint_cache.version += 1; let mut splice = InlaySplice { to_remove: new_update.remove_from_visible, to_insert: Vec::new(), }; for new_hint in new_update.add_to_cache { let new_hint_position = multi_buffer_snapshot .anchor_in_excerpt(query.excerpt_id, new_hint.position); let new_inlay_id = post_inc(&mut editor.next_inlay_id); if editor .inlay_hint_cache .allowed_hint_kinds .contains(&new_hint.kind) { splice.to_insert.push(Inlay::hint( new_inlay_id, new_hint_position, &new_hint, )); } cached_excerpt_hints .hints .push((InlayId::Hint(new_inlay_id), new_hint)); } cached_excerpt_hints .hints .sort_by(|(_, hint_a), (_, hint_b)| { hint_a.position.cmp(&hint_b.position, &buffer_snapshot) }); drop(cached_excerpt_hints); if query.invalidate.should_invalidate() { let mut outdated_excerpt_caches = HashSet::default(); for (excerpt_id, excerpt_hints) in &editor.inlay_hint_cache().hints { let excerpt_hints = excerpt_hints.read(); if excerpt_hints.buffer_id == query.buffer_id && excerpt_id != &query.excerpt_id && buffer_snapshot .version() .changed_since(&excerpt_hints.buffer_version) { outdated_excerpt_caches.insert(*excerpt_id); splice .to_remove .extend(excerpt_hints.hints.iter().map(|(id, _)| id)); } } editor .inlay_hint_cache .hints .retain(|excerpt_id, _| !outdated_excerpt_caches.contains(excerpt_id)); } let InlaySplice { to_remove, to_insert, } = splice; if !to_remove.is_empty() || !to_insert.is_empty() { editor.splice_inlay_hints(to_remove, to_insert, cx) } } }) .ok(); Ok(update_happened) } fn calculate_hint_updates( query: ExcerptQuery, fetch_range: Range, new_excerpt_hints: Vec, buffer_snapshot: &BufferSnapshot, cached_excerpt_hints: Option>>, visible_hints: &[Inlay], ) -> Option { let mut add_to_cache: HashSet = HashSet::default(); let mut excerpt_hints_to_persist = HashMap::default(); for new_hint in new_excerpt_hints { if !contains_position(&fetch_range, new_hint.position, buffer_snapshot) { continue; } let missing_from_cache = match &cached_excerpt_hints { Some(cached_excerpt_hints) => { let cached_excerpt_hints = cached_excerpt_hints.read(); match cached_excerpt_hints.hints.binary_search_by(|probe| { probe.1.position.cmp(&new_hint.position, buffer_snapshot) }) { Ok(ix) => { let (cached_inlay_id, cached_hint) = &cached_excerpt_hints.hints[ix]; if cached_hint == &new_hint { excerpt_hints_to_persist.insert(*cached_inlay_id, cached_hint.kind); false } else { true } } Err(_) => true, } } None => true, }; if missing_from_cache { add_to_cache.insert(new_hint); } } let mut remove_from_visible = Vec::new(); let mut remove_from_cache = HashSet::default(); if query.invalidate.should_invalidate() { remove_from_visible.extend( visible_hints .iter() .filter(|hint| hint.position.excerpt_id == query.excerpt_id) .filter(|hint| { contains_position(&fetch_range, hint.position.text_anchor, buffer_snapshot) }) .filter(|hint| { fetch_range .start .cmp(&hint.position.text_anchor, buffer_snapshot) .is_le() && fetch_range .end .cmp(&hint.position.text_anchor, buffer_snapshot) .is_ge() }) .map(|inlay_hint| inlay_hint.id) .filter(|hint_id| !excerpt_hints_to_persist.contains_key(hint_id)), ); if let Some(cached_excerpt_hints) = &cached_excerpt_hints { let cached_excerpt_hints = cached_excerpt_hints.read(); remove_from_cache.extend( cached_excerpt_hints .hints .iter() .filter(|(cached_inlay_id, _)| { !excerpt_hints_to_persist.contains_key(cached_inlay_id) }) .filter(|(_, cached_hint)| { fetch_range .start .cmp(&cached_hint.position, buffer_snapshot) .is_le() && fetch_range .end .cmp(&cached_hint.position, buffer_snapshot) .is_ge() }) .map(|(cached_inlay_id, _)| *cached_inlay_id), ); } } if remove_from_visible.is_empty() && remove_from_cache.is_empty() && add_to_cache.is_empty() { None } else { Some(ExcerptHintsUpdate { excerpt_id: query.excerpt_id, remove_from_visible, remove_from_cache, add_to_cache, }) } } fn contains_position( range: &Range, position: language::Anchor, buffer_snapshot: &BufferSnapshot, ) -> bool { range.start.cmp(&position, buffer_snapshot).is_le() && range.end.cmp(&position, buffer_snapshot).is_ge() } #[cfg(test)] mod tests { use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use crate::{ scroll::{autoscroll::Autoscroll, scroll_amount::ScrollAmount}, serde_json::json, ExcerptRange, }; use futures::StreamExt; use gpui::{executor::Deterministic, TestAppContext, ViewHandle}; use language::{ language_settings::AllLanguageSettingsContent, FakeLspAdapter, Language, LanguageConfig, }; use lsp::FakeLanguageServer; use parking_lot::Mutex; use project::{FakeFs, Project}; use settings::SettingsStore; use text::Point; use workspace::Workspace; use crate::editor_tests::update_test_language_settings; use super::*; #[gpui::test] async fn test_basic_cache_update_with_duplicate_hints(cx: &mut gpui::TestAppContext) { let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]); init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)), show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)), show_other_hints: allowed_hint_kinds.contains(&None), }) }); let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await; let lsp_request_count = Arc::new(AtomicU32::new(0)); fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&lsp_request_count); async move { assert_eq!( params.text_document.uri, lsp::Url::from_file_path(file_with_hints).unwrap(), ); let current_call_id = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); let mut new_hints = Vec::with_capacity(2 * current_call_id as usize); for _ in 0..2 { let mut i = current_call_id; loop { new_hints.push(lsp::InlayHint { position: lsp::Position::new(0, i), label: lsp::InlayHintLabel::String(i.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }); if i == 0 { break; } i -= 1; } } Ok(Some(new_hints)) } }) .next() .await; cx.foreground().run_until_parked(); let mut edits_made = 1; editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should get its first hints when opening the editor" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, allowed_hint_kinds, "Cache should use editor settings to get the allowed hint kinds" ); assert_eq!( inlay_cache.version, edits_made, "The editor update the cache version after every cache/view change" ); }); editor.update(cx, |editor, cx| { editor.change_selections(None, cx, |s| s.select_ranges([13..13])); editor.handle_input("some change", cx); edits_made += 1; }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string(), "1".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should get new hints after an edit" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, allowed_hint_kinds, "Cache should use editor settings to get the allowed hint kinds" ); assert_eq!( inlay_cache.version, edits_made, "The editor update the cache version after every cache/view change" ); }); fake_server .request::(()) .await .expect("inlay refresh request failed"); edits_made += 1; cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string(), "1".to_string(), "2".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should get new hints after hint refresh/ request" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, allowed_hint_kinds, "Cache should use editor settings to get the allowed hint kinds" ); assert_eq!( inlay_cache.version, edits_made, "The editor update the cache version after every cache/view change" ); }); } #[gpui::test] async fn test_cache_update_on_lsp_completion_tasks(cx: &mut gpui::TestAppContext) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await; let lsp_request_count = Arc::new(AtomicU32::new(0)); fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&lsp_request_count); async move { assert_eq!( params.text_document.uri, lsp::Url::from_file_path(file_with_hints).unwrap(), ); let current_call_id = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Ok(Some(vec![lsp::InlayHint { position: lsp::Position::new(0, current_call_id), label: lsp::InlayHintLabel::String(current_call_id.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }])) } }) .next() .await; cx.foreground().run_until_parked(); let mut edits_made = 1; editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should get its first hints when opening the editor" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, edits_made, "The editor update the cache version after every cache/view change" ); }); let progress_token = "test_progress_token"; fake_server .request::(lsp::WorkDoneProgressCreateParams { token: lsp::ProgressToken::String(progress_token.to_string()), }) .await .expect("work done progress create request failed"); cx.foreground().run_until_parked(); fake_server.notify::(lsp::ProgressParams { token: lsp::ProgressToken::String(progress_token.to_string()), value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin( lsp::WorkDoneProgressBegin::default(), )), }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should not update hints while the work task is running" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, edits_made, "Should not update the cache while the work task is running" ); }); fake_server.notify::(lsp::ProgressParams { token: lsp::ProgressToken::String(progress_token.to_string()), value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End( lsp::WorkDoneProgressEnd::default(), )), }); cx.foreground().run_until_parked(); edits_made += 1; editor.update(cx, |editor, cx| { let expected_layers = vec!["1".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "New hints should be queried after the work task is done" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, edits_made, "Cache version should udpate once after the work task is done" ); }); } #[gpui::test] async fn test_no_hint_updates_for_unrelated_language_files(cx: &mut gpui::TestAppContext) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); let fs = FakeFs::new(cx.background()); fs.insert_tree( "/a", json!({ "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out", "other.md": "Test md file with some text", }), ) .await; let project = Project::test(fs, ["/a".as_ref()], cx).await; let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let worktree_id = workspace.update(cx, |workspace, cx| { workspace.project().read_with(cx, |project, cx| { project.worktrees(cx).next().unwrap().read(cx).id() }) }); let mut rs_fake_servers = None; let mut md_fake_servers = None; for (name, path_suffix) in [("Rust", "rs"), ("Markdown", "md")] { let mut language = Language::new( LanguageConfig { name: name.into(), path_suffixes: vec![path_suffix.to_string()], ..Default::default() }, Some(tree_sitter_rust::language()), ); let fake_servers = language .set_fake_lsp_adapter(Arc::new(FakeLspAdapter { name, capabilities: lsp::ServerCapabilities { inlay_hint_provider: Some(lsp::OneOf::Left(true)), ..Default::default() }, ..Default::default() })) .await; match name { "Rust" => rs_fake_servers = Some(fake_servers), "Markdown" => md_fake_servers = Some(fake_servers), _ => unreachable!(), } project.update(cx, |project, _| { project.languages().add(Arc::new(language)); }); } let _rs_buffer = project .update(cx, |project, cx| { project.open_local_buffer("/a/main.rs", cx) }) .await .unwrap(); cx.foreground().run_until_parked(); cx.foreground().start_waiting(); let rs_fake_server = rs_fake_servers.unwrap().next().await.unwrap(); let rs_editor = workspace .update(cx, |workspace, cx| { workspace.open_path((worktree_id, "main.rs"), None, true, cx) }) .await .unwrap() .downcast::() .unwrap(); let rs_lsp_request_count = Arc::new(AtomicU32::new(0)); rs_fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&rs_lsp_request_count); async move { assert_eq!( params.text_document.uri, lsp::Url::from_file_path("/a/main.rs").unwrap(), ); let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Ok(Some(vec![lsp::InlayHint { position: lsp::Position::new(0, i), label: lsp::InlayHintLabel::String(i.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }])) } }) .next() .await; cx.foreground().run_until_parked(); rs_editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should get its first hints when opening the editor" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, 1, "Rust editor update the cache version after every cache/view change" ); }); cx.foreground().run_until_parked(); let _md_buffer = project .update(cx, |project, cx| { project.open_local_buffer("/a/other.md", cx) }) .await .unwrap(); cx.foreground().run_until_parked(); cx.foreground().start_waiting(); let md_fake_server = md_fake_servers.unwrap().next().await.unwrap(); let md_editor = workspace .update(cx, |workspace, cx| { workspace.open_path((worktree_id, "other.md"), None, true, cx) }) .await .unwrap() .downcast::() .unwrap(); let md_lsp_request_count = Arc::new(AtomicU32::new(0)); md_fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&md_lsp_request_count); async move { assert_eq!( params.text_document.uri, lsp::Url::from_file_path("/a/other.md").unwrap(), ); let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Ok(Some(vec![lsp::InlayHint { position: lsp::Position::new(0, i), label: lsp::InlayHintLabel::String(i.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }])) } }) .next() .await; cx.foreground().run_until_parked(); md_editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Markdown editor should have a separate verison, repeating Rust editor rules" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, 1); }); rs_editor.update(cx, |editor, cx| { editor.change_selections(None, cx, |s| s.select_ranges([13..13])); editor.handle_input("some rs change", cx); }); cx.foreground().run_until_parked(); rs_editor.update(cx, |editor, cx| { let expected_layers = vec!["1".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Rust inlay cache should change after the edit" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, 2, "Every time hint cache changes, cache version should be incremented" ); }); md_editor.update(cx, |editor, cx| { let expected_layers = vec!["0".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Markdown editor should not be affected by Rust editor changes" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, 1); }); md_editor.update(cx, |editor, cx| { editor.change_selections(None, cx, |s| s.select_ranges([13..13])); editor.handle_input("some md change", cx); }); cx.foreground().run_until_parked(); md_editor.update(cx, |editor, cx| { let expected_layers = vec!["1".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Rust editor should not be affected by Markdown editor changes" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, 2); }); rs_editor.update(cx, |editor, cx| { let expected_layers = vec!["1".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Markdown editor should also change independently" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, 2); }); } #[gpui::test] async fn test_hint_setting_changes(cx: &mut gpui::TestAppContext) { let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]); init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)), show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)), show_other_hints: allowed_hint_kinds.contains(&None), }) }); let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await; let lsp_request_count = Arc::new(AtomicU32::new(0)); let another_lsp_request_count = Arc::clone(&lsp_request_count); fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&another_lsp_request_count); async move { Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); assert_eq!( params.text_document.uri, lsp::Url::from_file_path(file_with_hints).unwrap(), ); Ok(Some(vec![ lsp::InlayHint { position: lsp::Position::new(0, 1), label: lsp::InlayHintLabel::String("type hint".to_string()), kind: Some(lsp::InlayHintKind::TYPE), text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }, lsp::InlayHint { position: lsp::Position::new(0, 2), label: lsp::InlayHintLabel::String("parameter hint".to_string()), kind: Some(lsp::InlayHintKind::PARAMETER), text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }, lsp::InlayHint { position: lsp::Position::new(0, 3), label: lsp::InlayHintLabel::String("other hint".to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }, ])) } }) .next() .await; cx.foreground().run_until_parked(); let mut edits_made = 1; editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 1, "Should query new hints once" ); assert_eq!( vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], cached_hint_labels(editor), "Should get its first hints when opening the editor" ); assert_eq!( vec!["other hint".to_string(), "type hint".to_string()], visible_hint_labels(editor, cx) ); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, allowed_hint_kinds, "Cache should use editor settings to get the allowed hint kinds" ); assert_eq!( inlay_cache.version, edits_made, "The editor update the cache version after every cache/view change" ); }); fake_server .request::(()) .await .expect("inlay refresh request failed"); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 2, "Should load new hints twice" ); assert_eq!( vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], cached_hint_labels(editor), "Cached hints should not change due to allowed hint kinds settings update" ); assert_eq!( vec!["other hint".to_string(), "type hint".to_string()], visible_hint_labels(editor, cx) ); assert_eq!( editor.inlay_hint_cache().version, edits_made, "Should not update cache version due to new loaded hints being the same" ); }); for (new_allowed_hint_kinds, expected_visible_hints) in [ (HashSet::from_iter([None]), vec!["other hint".to_string()]), ( HashSet::from_iter([Some(InlayHintKind::Type)]), vec!["type hint".to_string()], ), ( HashSet::from_iter([Some(InlayHintKind::Parameter)]), vec!["parameter hint".to_string()], ), ( HashSet::from_iter([None, Some(InlayHintKind::Type)]), vec!["other hint".to_string(), "type hint".to_string()], ), ( HashSet::from_iter([None, Some(InlayHintKind::Parameter)]), vec!["other hint".to_string(), "parameter hint".to_string()], ), ( HashSet::from_iter([Some(InlayHintKind::Type), Some(InlayHintKind::Parameter)]), vec!["parameter hint".to_string(), "type hint".to_string()], ), ( HashSet::from_iter([ None, Some(InlayHintKind::Type), Some(InlayHintKind::Parameter), ]), vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], ), ] { edits_made += 1; update_test_language_settings(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: new_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)), show_parameter_hints: new_allowed_hint_kinds .contains(&Some(InlayHintKind::Parameter)), show_other_hints: new_allowed_hint_kinds.contains(&None), }) }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 2, "Should not load new hints on allowed hint kinds change for hint kinds {new_allowed_hint_kinds:?}" ); assert_eq!( vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], cached_hint_labels(editor), "Should get its cached hints unchanged after the settings change for hint kinds {new_allowed_hint_kinds:?}" ); assert_eq!( expected_visible_hints, visible_hint_labels(editor, cx), "Should get its visible hints filtered after the settings change for hint kinds {new_allowed_hint_kinds:?}" ); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, new_allowed_hint_kinds, "Cache should use editor settings to get the allowed hint kinds for hint kinds {new_allowed_hint_kinds:?}" ); assert_eq!( inlay_cache.version, edits_made, "The editor should update the cache version after every cache/view change for hint kinds {new_allowed_hint_kinds:?} due to visible hints change" ); }); } edits_made += 1; let another_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Type)]); update_test_language_settings(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: false, show_type_hints: another_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)), show_parameter_hints: another_allowed_hint_kinds .contains(&Some(InlayHintKind::Parameter)), show_other_hints: another_allowed_hint_kinds.contains(&None), }) }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 2, "Should not load new hints when hints got disabled" ); assert!( cached_hint_labels(editor).is_empty(), "Should clear the cache when hints got disabled" ); assert!( visible_hint_labels(editor, cx).is_empty(), "Should clear visible hints when hints got disabled" ); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds, "Should update its allowed hint kinds even when hints got disabled" ); assert_eq!( inlay_cache.version, edits_made, "The editor should update the cache version after hints got disabled" ); }); fake_server .request::(()) .await .expect("inlay refresh request failed"); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 2, "Should not load new hints when they got disabled" ); assert!(cached_hint_labels(editor).is_empty()); assert!(visible_hint_labels(editor, cx).is_empty()); assert_eq!( editor.inlay_hint_cache().version, edits_made, "The editor should not update the cache version after /refresh query without updates" ); }); let final_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Parameter)]); edits_made += 1; update_test_language_settings(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: final_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)), show_parameter_hints: final_allowed_hint_kinds .contains(&Some(InlayHintKind::Parameter)), show_other_hints: final_allowed_hint_kinds.contains(&None), }) }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 3, "Should query for new hints when they got reenabled" ); assert_eq!( vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], cached_hint_labels(editor), "Should get its cached hints fully repopulated after the hints got reenabled" ); assert_eq!( vec!["parameter hint".to_string()], visible_hint_labels(editor, cx), "Should get its visible hints repopulated and filtered after the h" ); let inlay_cache = editor.inlay_hint_cache(); assert_eq!( inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds, "Cache should update editor settings when hints got reenabled" ); assert_eq!( inlay_cache.version, edits_made, "Cache should update its version after hints got reenabled" ); }); fake_server .request::(()) .await .expect("inlay refresh request failed"); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( lsp_request_count.load(Ordering::Relaxed), 4, "Should query for new hints again" ); assert_eq!( vec![ "other hint".to_string(), "parameter hint".to_string(), "type hint".to_string(), ], cached_hint_labels(editor), ); assert_eq!( vec!["parameter hint".to_string()], visible_hint_labels(editor, cx), ); assert_eq!(editor.inlay_hint_cache().version, edits_made); }); } #[gpui::test] async fn test_hint_request_cancellation(cx: &mut gpui::TestAppContext) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await; let fake_server = Arc::new(fake_server); let lsp_request_count = Arc::new(AtomicU32::new(0)); let another_lsp_request_count = Arc::clone(&lsp_request_count); fake_server .handle_request::(move |params, _| { let task_lsp_request_count = Arc::clone(&another_lsp_request_count); async move { let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1; assert_eq!( params.text_document.uri, lsp::Url::from_file_path(file_with_hints).unwrap(), ); Ok(Some(vec![lsp::InlayHint { position: lsp::Position::new(0, i), label: lsp::InlayHintLabel::String(i.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }])) } }) .next() .await; let mut expected_changes = Vec::new(); for change_after_opening in [ "initial change #1", "initial change #2", "initial change #3", ] { editor.update(cx, |editor, cx| { editor.change_selections(None, cx, |s| s.select_ranges([13..13])); editor.handle_input(change_after_opening, cx); }); expected_changes.push(change_after_opening); } cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let current_text = editor.text(cx); for change in &expected_changes { assert!( current_text.contains(change), "Should apply all changes made" ); } assert_eq!( lsp_request_count.load(Ordering::Relaxed), 2, "Should query new hints twice: for editor init and for the last edit that interrupted all others" ); let expected_hints = vec!["2".to_string()]; assert_eq!( expected_hints, cached_hint_labels(editor), "Should get hints from the last edit landed only" ); assert_eq!(expected_hints, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, 1, "Only one update should be registered in the cache after all cancellations" ); }); let mut edits = Vec::new(); for async_later_change in [ "another change #1", "another change #2", "another change #3", ] { expected_changes.push(async_later_change); let task_editor = editor.clone(); let mut task_cx = cx.clone(); edits.push(cx.foreground().spawn(async move { task_editor.update(&mut task_cx, |editor, cx| { editor.change_selections(None, cx, |s| s.select_ranges([13..13])); editor.handle_input(async_later_change, cx); }); })); } let _ = futures::future::join_all(edits).await; cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let current_text = editor.text(cx); for change in &expected_changes { assert!( current_text.contains(change), "Should apply all changes made" ); } assert_eq!( lsp_request_count.load(Ordering::SeqCst), 3, "Should query new hints one more time, for the last edit only" ); let expected_hints = vec!["3".to_string()]; assert_eq!( expected_hints, cached_hint_labels(editor), "Should get hints from the last edit landed only" ); assert_eq!(expected_hints, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, 2, "Should update the cache version once more, for the new change" ); }); } #[gpui::test] async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); let mut language = Language::new( LanguageConfig { name: "Rust".into(), path_suffixes: vec!["rs".to_string()], ..Default::default() }, Some(tree_sitter_rust::language()), ); let mut fake_servers = language .set_fake_lsp_adapter(Arc::new(FakeLspAdapter { capabilities: lsp::ServerCapabilities { inlay_hint_provider: Some(lsp::OneOf::Left(true)), ..Default::default() }, ..Default::default() })) .await; let fs = FakeFs::new(cx.background()); fs.insert_tree( "/a", json!({ "main.rs": format!("fn main() {{\n{}\n}}", "let i = 5;\n".repeat(500)), "other.rs": "// Test file", }), ) .await; let project = Project::test(fs, ["/a".as_ref()], cx).await; project.update(cx, |project, _| project.languages().add(Arc::new(language))); let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let worktree_id = workspace.update(cx, |workspace, cx| { workspace.project().read_with(cx, |project, cx| { project.worktrees(cx).next().unwrap().read(cx).id() }) }); let _buffer = project .update(cx, |project, cx| { project.open_local_buffer("/a/main.rs", cx) }) .await .unwrap(); cx.foreground().run_until_parked(); cx.foreground().start_waiting(); let fake_server = fake_servers.next().await.unwrap(); let editor = workspace .update(cx, |workspace, cx| { workspace.open_path((worktree_id, "main.rs"), None, true, cx) }) .await .unwrap() .downcast::() .unwrap(); let lsp_request_ranges = Arc::new(Mutex::new(Vec::new())); let lsp_request_count = Arc::new(AtomicU32::new(0)); let closure_lsp_request_ranges = Arc::clone(&lsp_request_ranges); let closure_lsp_request_count = Arc::clone(&lsp_request_count); fake_server .handle_request::(move |params, _| { let task_lsp_request_ranges = Arc::clone(&closure_lsp_request_ranges); let task_lsp_request_count = Arc::clone(&closure_lsp_request_count); async move { assert_eq!( params.text_document.uri, lsp::Url::from_file_path("/a/main.rs").unwrap(), ); task_lsp_request_ranges.lock().push(params.range); let query_start = params.range.start; let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1; Ok(Some(vec![lsp::InlayHint { position: query_start, label: lsp::InlayHintLabel::String(i.to_string()), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }])) } }) .next() .await; cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let mut ranges = lsp_request_ranges.lock().drain(..).collect::>(); ranges.sort_by_key(|range| range.start); assert_eq!(ranges.len(), 2, "When scroll is at the edge of a big document, its visible part + the rest should be queried for hints"); assert_eq!(ranges[0].start, lsp::Position::new(0, 0), "Should query from the beginning of the document"); assert_eq!(ranges[0].end.line, ranges[1].start.line, "Both requests should be on the same line"); assert_eq!(ranges[0].end.character + 1, ranges[1].start.character, "Both request should be concequent"); assert_eq!(lsp_request_count.load(Ordering::SeqCst), 2, "When scroll is at the edge of a big document, its visible part + the rest should be queried for hints"); let expected_layers = vec!["1".to_string(), "2".to_string()]; assert_eq!( expected_layers, cached_hint_labels(editor), "Should have hints from both LSP requests made for a big file" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, 2, "Both LSP queries should've bumped the cache version" ); }); editor.update(cx, |editor, cx| { editor.scroll_screen(&ScrollAmount::Page(1.0), cx); editor.scroll_screen(&ScrollAmount::Page(1.0), cx); editor.change_selections(None, cx, |s| s.select_ranges([600..600])); editor.handle_input("++++more text++++", cx); }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let mut ranges = lsp_request_ranges.lock().drain(..).collect::>(); ranges.sort_by_key(|range| range.start); assert_eq!(ranges.len(), 3, "When scroll is at the middle of a big document, its visible part + 2 other inbisible parts should be queried for hints"); assert_eq!(ranges[0].start, lsp::Position::new(0, 0), "Should query from the beginning of the document"); assert_eq!(ranges[0].end.line + 1, ranges[1].start.line, "Neighbour requests got on different lines due to the line end"); assert_ne!(ranges[0].end.character, 0, "First query was in the end of the line, not in the beginning"); assert_eq!(ranges[1].start.character, 0, "Second query got pushed into a new line and starts from the beginning"); assert_eq!(ranges[1].end.line, ranges[2].start.line, "Neighbour requests should be on the same line"); assert_eq!(ranges[1].end.character + 1, ranges[2].start.character, "Neighbour request should be concequent"); assert_eq!(lsp_request_count.load(Ordering::SeqCst), 5, "When scroll not at the edge of a big document, visible part + 2 other parts should be queried for hints"); let expected_layers = vec!["3".to_string(), "4".to_string(), "5".to_string()]; assert_eq!(expected_layers, cached_hint_labels(editor), "Should have hints from the new LSP response after edit"); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, 5, "Should update the cache for every LSP response with hints added"); }); } #[gpui::test] async fn test_multiple_excerpts_large_multibuffer( deterministic: Arc, cx: &mut gpui::TestAppContext, ) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); let mut language = Language::new( LanguageConfig { name: "Rust".into(), path_suffixes: vec!["rs".to_string()], ..Default::default() }, Some(tree_sitter_rust::language()), ); let mut fake_servers = language .set_fake_lsp_adapter(Arc::new(FakeLspAdapter { capabilities: lsp::ServerCapabilities { inlay_hint_provider: Some(lsp::OneOf::Left(true)), ..Default::default() }, ..Default::default() })) .await; let language = Arc::new(language); let fs = FakeFs::new(cx.background()); fs.insert_tree( "/a", json!({ "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::>().join("")), "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::>().join("")), }), ) .await; let project = Project::test(fs, ["/a".as_ref()], cx).await; project.update(cx, |project, _| { project.languages().add(Arc::clone(&language)) }); let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let worktree_id = workspace.update(cx, |workspace, cx| { workspace.project().read_with(cx, |project, cx| { project.worktrees(cx).next().unwrap().read(cx).id() }) }); let buffer_1 = project .update(cx, |project, cx| { project.open_buffer((worktree_id, "main.rs"), cx) }) .await .unwrap(); let buffer_2 = project .update(cx, |project, cx| { project.open_buffer((worktree_id, "other.rs"), cx) }) .await .unwrap(); let multibuffer = cx.add_model(|cx| { let mut multibuffer = MultiBuffer::new(0); multibuffer.push_excerpts( buffer_1.clone(), [ ExcerptRange { context: Point::new(0, 0)..Point::new(2, 0), primary: None, }, ExcerptRange { context: Point::new(4, 0)..Point::new(11, 0), primary: None, }, ExcerptRange { context: Point::new(22, 0)..Point::new(33, 0), primary: None, }, ExcerptRange { context: Point::new(44, 0)..Point::new(55, 0), primary: None, }, ExcerptRange { context: Point::new(56, 0)..Point::new(66, 0), primary: None, }, ExcerptRange { context: Point::new(67, 0)..Point::new(77, 0), primary: None, }, ], cx, ); multibuffer.push_excerpts( buffer_2.clone(), [ ExcerptRange { context: Point::new(0, 1)..Point::new(2, 1), primary: None, }, ExcerptRange { context: Point::new(4, 1)..Point::new(11, 1), primary: None, }, ExcerptRange { context: Point::new(22, 1)..Point::new(33, 1), primary: None, }, ExcerptRange { context: Point::new(44, 1)..Point::new(55, 1), primary: None, }, ExcerptRange { context: Point::new(56, 1)..Point::new(66, 1), primary: None, }, ExcerptRange { context: Point::new(67, 1)..Point::new(77, 1), primary: None, }, ], cx, ); multibuffer }); deterministic.run_until_parked(); cx.foreground().run_until_parked(); let (_, editor) = cx.add_window(|cx| Editor::for_multibuffer(multibuffer, Some(project.clone()), cx)); let editor_edited = Arc::new(AtomicBool::new(false)); let fake_server = fake_servers.next().await.unwrap(); let closure_editor_edited = Arc::clone(&editor_edited); fake_server .handle_request::(move |params, _| { let task_editor_edited = Arc::clone(&closure_editor_edited); async move { let hint_text = if params.text_document.uri == lsp::Url::from_file_path("/a/main.rs").unwrap() { "main hint" } else if params.text_document.uri == lsp::Url::from_file_path("/a/other.rs").unwrap() { "other hint" } else { panic!("unexpected uri: {:?}", params.text_document.uri); }; // one hint per excerpt let positions = [ lsp::Position::new(0, 2), lsp::Position::new(4, 2), lsp::Position::new(22, 2), lsp::Position::new(44, 2), lsp::Position::new(56, 2), lsp::Position::new(67, 2), ]; let out_of_range_hint = lsp::InlayHint { position: lsp::Position::new( params.range.start.line + 99, params.range.start.character + 99, ), label: lsp::InlayHintLabel::String( "out of excerpt range, should be ignored".to_string(), ), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }; let edited = task_editor_edited.load(Ordering::Acquire); Ok(Some( std::iter::once(out_of_range_hint) .chain(positions.into_iter().enumerate().map(|(i, position)| { lsp::InlayHint { position, label: lsp::InlayHintLabel::String(format!( "{hint_text}{} #{i}", if edited { "(edited)" } else { "" }, )), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, } })) .collect(), )) } }) .next() .await; cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec![ "main hint #0".to_string(), "main hint #1".to_string(), "main hint #2".to_string(), "main hint #3".to_string(), ]; assert_eq!( expected_layers, cached_hint_labels(editor), "When scroll is at the edge of a multibuffer, its visible excerpts only should be queried for inlay hints" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, expected_layers.len(), "Every visible excerpt hints should bump the verison"); }); editor.update(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::Next), cx, |s| { s.select_ranges([Point::new(4, 0)..Point::new(4, 0)]) }); editor.change_selections(Some(Autoscroll::Next), cx, |s| { s.select_ranges([Point::new(22, 0)..Point::new(22, 0)]) }); editor.change_selections(Some(Autoscroll::Next), cx, |s| { s.select_ranges([Point::new(56, 0)..Point::new(56, 0)]) }); }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec![ "main hint #0".to_string(), "main hint #1".to_string(), "main hint #2".to_string(), "main hint #3".to_string(), "main hint #4".to_string(), "main hint #5".to_string(), "other hint #0".to_string(), "other hint #1".to_string(), "other hint #2".to_string(), ]; assert_eq!(expected_layers, cached_hint_labels(editor), "With more scrolls of the multibuffer, more hints should be added into the cache and nothing invalidated without edits"); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, expected_layers.len(), "Due to every excerpt having one hint, we update cache per new excerpt scrolled"); }); editor.update(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::Next), cx, |s| { s.select_ranges([Point::new(100, 0)..Point::new(100, 0)]) }); }); cx.foreground().run_until_parked(); let last_scroll_update_version = editor.update(cx, |editor, cx| { let expected_layers = vec![ "main hint #0".to_string(), "main hint #1".to_string(), "main hint #2".to_string(), "main hint #3".to_string(), "main hint #4".to_string(), "main hint #5".to_string(), "other hint #0".to_string(), "other hint #1".to_string(), "other hint #2".to_string(), "other hint #3".to_string(), "other hint #4".to_string(), "other hint #5".to_string(), ]; assert_eq!(expected_layers, cached_hint_labels(editor), "After multibuffer was scrolled to the end, all hints for all excerpts should be fetched"); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, expected_layers.len()); expected_layers.len() }); editor.update(cx, |editor, cx| { editor.change_selections(Some(Autoscroll::Next), cx, |s| { s.select_ranges([Point::new(4, 0)..Point::new(4, 0)]) }); }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec![ "main hint #0".to_string(), "main hint #1".to_string(), "main hint #2".to_string(), "main hint #3".to_string(), "main hint #4".to_string(), "main hint #5".to_string(), "other hint #0".to_string(), "other hint #1".to_string(), "other hint #2".to_string(), "other hint #3".to_string(), "other hint #4".to_string(), "other hint #5".to_string(), ]; assert_eq!(expected_layers, cached_hint_labels(editor), "After multibuffer was scrolled to the end, further scrolls up should not bring more hints"); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!(editor.inlay_hint_cache().version, last_scroll_update_version, "No updates should happen during scrolling already scolled buffer"); }); editor_edited.store(true, Ordering::Release); editor.update(cx, |editor, cx| { editor.change_selections(None, cx, |s| { s.select_ranges([Point::new(56, 0)..Point::new(56, 0)]) }); editor.handle_input("++++more text++++", cx); }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_layers = vec![ "main hint(edited) #0".to_string(), "main hint(edited) #1".to_string(), "main hint(edited) #2".to_string(), "main hint(edited) #3".to_string(), "main hint(edited) #4".to_string(), "main hint(edited) #5".to_string(), "other hint(edited) #0".to_string(), "other hint(edited) #1".to_string(), ]; assert_eq!( expected_layers, cached_hint_labels(editor), "After multibuffer edit, editor gets scolled back to the last selection; \ all hints should be invalidated and requeried for all of its visible excerpts" ); assert_eq!(expected_layers, visible_hint_labels(editor, cx)); assert_eq!( editor.inlay_hint_cache().version, last_scroll_update_version + expected_layers.len() + 1, "Due to every excerpt having one hint, cache should update per new excerpt received + 1 for outdated hints removal" ); }); } #[gpui::test] async fn test_excerpts_removed( deterministic: Arc, cx: &mut gpui::TestAppContext, ) { init_test(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: false, show_parameter_hints: false, show_other_hints: false, }) }); let mut language = Language::new( LanguageConfig { name: "Rust".into(), path_suffixes: vec!["rs".to_string()], ..Default::default() }, Some(tree_sitter_rust::language()), ); let mut fake_servers = language .set_fake_lsp_adapter(Arc::new(FakeLspAdapter { capabilities: lsp::ServerCapabilities { inlay_hint_provider: Some(lsp::OneOf::Left(true)), ..Default::default() }, ..Default::default() })) .await; let language = Arc::new(language); let fs = FakeFs::new(cx.background()); fs.insert_tree( "/a", json!({ "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::>().join("")), "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::>().join("")), }), ) .await; let project = Project::test(fs, ["/a".as_ref()], cx).await; project.update(cx, |project, _| { project.languages().add(Arc::clone(&language)) }); let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let worktree_id = workspace.update(cx, |workspace, cx| { workspace.project().read_with(cx, |project, cx| { project.worktrees(cx).next().unwrap().read(cx).id() }) }); let buffer_1 = project .update(cx, |project, cx| { project.open_buffer((worktree_id, "main.rs"), cx) }) .await .unwrap(); let buffer_2 = project .update(cx, |project, cx| { project.open_buffer((worktree_id, "other.rs"), cx) }) .await .unwrap(); let multibuffer = cx.add_model(|_| MultiBuffer::new(0)); let (buffer_1_excerpts, buffer_2_excerpts) = multibuffer.update(cx, |multibuffer, cx| { let buffer_1_excerpts = multibuffer.push_excerpts( buffer_1.clone(), [ExcerptRange { context: Point::new(0, 0)..Point::new(2, 0), primary: None, }], cx, ); let buffer_2_excerpts = multibuffer.push_excerpts( buffer_2.clone(), [ExcerptRange { context: Point::new(0, 1)..Point::new(2, 1), primary: None, }], cx, ); (buffer_1_excerpts, buffer_2_excerpts) }); assert!(!buffer_1_excerpts.is_empty()); assert!(!buffer_2_excerpts.is_empty()); deterministic.run_until_parked(); cx.foreground().run_until_parked(); let (_, editor) = cx.add_window(|cx| Editor::for_multibuffer(multibuffer, Some(project.clone()), cx)); let editor_edited = Arc::new(AtomicBool::new(false)); let fake_server = fake_servers.next().await.unwrap(); let closure_editor_edited = Arc::clone(&editor_edited); fake_server .handle_request::(move |params, _| { let task_editor_edited = Arc::clone(&closure_editor_edited); async move { let hint_text = if params.text_document.uri == lsp::Url::from_file_path("/a/main.rs").unwrap() { "main hint" } else if params.text_document.uri == lsp::Url::from_file_path("/a/other.rs").unwrap() { "other hint" } else { panic!("unexpected uri: {:?}", params.text_document.uri); }; let positions = [ lsp::Position::new(0, 2), lsp::Position::new(4, 2), lsp::Position::new(22, 2), lsp::Position::new(44, 2), lsp::Position::new(56, 2), lsp::Position::new(67, 2), ]; let out_of_range_hint = lsp::InlayHint { position: lsp::Position::new( params.range.start.line + 99, params.range.start.character + 99, ), label: lsp::InlayHintLabel::String( "out of excerpt range, should be ignored".to_string(), ), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, }; let edited = task_editor_edited.load(Ordering::Acquire); Ok(Some( std::iter::once(out_of_range_hint) .chain(positions.into_iter().enumerate().map(|(i, position)| { lsp::InlayHint { position, label: lsp::InlayHintLabel::String(format!( "{hint_text}{} #{i}", if edited { "(edited)" } else { "" }, )), kind: None, text_edits: None, tooltip: None, padding_left: None, padding_right: None, data: None, } })) .collect(), )) } }) .next() .await; cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( vec!["main hint #0".to_string(), "other hint #0".to_string()], cached_hint_labels(editor), "Cache should update for both excerpts despite hints display was disabled" ); assert!( visible_hint_labels(editor, cx).is_empty(), "All hints are disabled and should not be shown despite being present in the cache" ); assert_eq!( editor.inlay_hint_cache().version, 2, "Cache should update once per excerpt query" ); }); editor.update(cx, |editor, cx| { editor.buffer().update(cx, |multibuffer, cx| { multibuffer.remove_excerpts(buffer_2_excerpts, cx) }) }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { assert_eq!( vec!["main hint #0".to_string()], cached_hint_labels(editor), "For the removed excerpt, should clean corresponding cached hints" ); assert!( visible_hint_labels(editor, cx).is_empty(), "All hints are disabled and should not be shown despite being present in the cache" ); assert_eq!( editor.inlay_hint_cache().version, 3, "Excerpt removal should trigger cache update" ); }); update_test_language_settings(cx, |settings| { settings.defaults.inlay_hints = Some(InlayHintSettings { enabled: true, show_type_hints: true, show_parameter_hints: true, show_other_hints: true, }) }); cx.foreground().run_until_parked(); editor.update(cx, |editor, cx| { let expected_hints = vec!["main hint #0".to_string()]; assert_eq!( expected_hints, cached_hint_labels(editor), "Hint display settings change should not change the cache" ); assert_eq!( expected_hints, visible_hint_labels(editor, cx), "Settings change should make cached hints visible" ); assert_eq!( editor.inlay_hint_cache().version, 4, "Settings change should trigger cache update" ); }); } pub(crate) fn init_test(cx: &mut TestAppContext, f: impl Fn(&mut AllLanguageSettingsContent)) { cx.foreground().forbid_parking(); cx.update(|cx| { cx.set_global(SettingsStore::test(cx)); theme::init((), cx); client::init_settings(cx); language::init(cx); Project::init_settings(cx); workspace::init_settings(cx); crate::init(cx); }); update_test_language_settings(cx, f); } async fn prepare_test_objects( cx: &mut TestAppContext, ) -> (&'static str, ViewHandle, FakeLanguageServer) { let mut language = Language::new( LanguageConfig { name: "Rust".into(), path_suffixes: vec!["rs".to_string()], ..Default::default() }, Some(tree_sitter_rust::language()), ); let mut fake_servers = language .set_fake_lsp_adapter(Arc::new(FakeLspAdapter { capabilities: lsp::ServerCapabilities { inlay_hint_provider: Some(lsp::OneOf::Left(true)), ..Default::default() }, ..Default::default() })) .await; let fs = FakeFs::new(cx.background()); fs.insert_tree( "/a", json!({ "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out", "other.rs": "// Test file", }), ) .await; let project = Project::test(fs, ["/a".as_ref()], cx).await; project.update(cx, |project, _| project.languages().add(Arc::new(language))); let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx)); let worktree_id = workspace.update(cx, |workspace, cx| { workspace.project().read_with(cx, |project, cx| { project.worktrees(cx).next().unwrap().read(cx).id() }) }); let _buffer = project .update(cx, |project, cx| { project.open_local_buffer("/a/main.rs", cx) }) .await .unwrap(); cx.foreground().run_until_parked(); cx.foreground().start_waiting(); let fake_server = fake_servers.next().await.unwrap(); let editor = workspace .update(cx, |workspace, cx| { workspace.open_path((worktree_id, "main.rs"), None, true, cx) }) .await .unwrap() .downcast::() .unwrap(); ("/a/main.rs", editor, fake_server) } fn cached_hint_labels(editor: &Editor) -> Vec { let mut labels = Vec::new(); for (_, excerpt_hints) in &editor.inlay_hint_cache().hints { let excerpt_hints = excerpt_hints.read(); for (_, inlay) in excerpt_hints.hints.iter() { match &inlay.label { project::InlayHintLabel::String(s) => labels.push(s.to_string()), _ => unreachable!(), } } } labels.sort(); labels } fn visible_hint_labels(editor: &Editor, cx: &ViewContext<'_, '_, Editor>) -> Vec { let mut hints = editor .visible_inlay_hints(cx) .into_iter() .map(|hint| hint.text.to_string()) .collect::>(); hints.sort(); hints } }