1use std::{
2 cmp,
3 ops::{ControlFlow, Range},
4 sync::Arc,
5 time::Duration,
6};
7
8use crate::{
9 display_map::Inlay, Anchor, Editor, ExcerptId, InlayId, MultiBuffer, MultiBufferSnapshot,
10};
11use anyhow::Context;
12use clock::Global;
13use futures::future;
14use gpui::{Model, ModelContext, Task, ViewContext};
15use language::{language_settings::InlayHintKind, Buffer, BufferSnapshot};
16use parking_lot::RwLock;
17use project::{InlayHint, ResolveState};
18
19use collections::{hash_map, HashMap, HashSet};
20use language::language_settings::InlayHintSettings;
21use smol::lock::Semaphore;
22use sum_tree::Bias;
23use text::{ToOffset, ToPoint};
24use util::post_inc;
25
26pub struct InlayHintCache {
27 hints: HashMap<ExcerptId, Arc<RwLock<CachedExcerptHints>>>,
28 allowed_hint_kinds: HashSet<Option<InlayHintKind>>,
29 version: usize,
30 pub(super) enabled: bool,
31 update_tasks: HashMap<ExcerptId, TasksForRanges>,
32 lsp_request_limiter: Arc<Semaphore>,
33}
34
35#[derive(Debug)]
36struct TasksForRanges {
37 tasks: Vec<Task<()>>,
38 sorted_ranges: Vec<Range<language::Anchor>>,
39}
40
41#[derive(Debug)]
42pub struct CachedExcerptHints {
43 version: usize,
44 buffer_version: Global,
45 buffer_id: u64,
46 ordered_hints: Vec<InlayId>,
47 hints_by_id: HashMap<InlayId, InlayHint>,
48}
49
50#[derive(Debug, Clone, Copy)]
51pub enum InvalidationStrategy {
52 RefreshRequested,
53 BufferEdited,
54 None,
55}
56
57#[derive(Debug, Default)]
58pub struct InlaySplice {
59 pub to_remove: Vec<InlayId>,
60 pub to_insert: Vec<Inlay>,
61}
62
63#[derive(Debug)]
64struct ExcerptHintsUpdate {
65 excerpt_id: ExcerptId,
66 remove_from_visible: Vec<InlayId>,
67 remove_from_cache: HashSet<InlayId>,
68 add_to_cache: Vec<InlayHint>,
69}
70
71#[derive(Debug, Clone, Copy)]
72struct ExcerptQuery {
73 buffer_id: u64,
74 excerpt_id: ExcerptId,
75 cache_version: usize,
76 invalidate: InvalidationStrategy,
77 reason: &'static str,
78}
79
80impl InvalidationStrategy {
81 fn should_invalidate(&self) -> bool {
82 matches!(
83 self,
84 InvalidationStrategy::RefreshRequested | InvalidationStrategy::BufferEdited
85 )
86 }
87}
88
89impl TasksForRanges {
90 fn new(query_ranges: QueryRanges, task: Task<()>) -> Self {
91 let mut sorted_ranges = Vec::new();
92 sorted_ranges.extend(query_ranges.before_visible);
93 sorted_ranges.extend(query_ranges.visible);
94 sorted_ranges.extend(query_ranges.after_visible);
95 Self {
96 tasks: vec![task],
97 sorted_ranges,
98 }
99 }
100
101 fn update_cached_tasks(
102 &mut self,
103 buffer_snapshot: &BufferSnapshot,
104 query_ranges: QueryRanges,
105 invalidate: InvalidationStrategy,
106 spawn_task: impl FnOnce(QueryRanges) -> Task<()>,
107 ) {
108 let query_ranges = if invalidate.should_invalidate() {
109 self.tasks.clear();
110 self.sorted_ranges.clear();
111 query_ranges
112 } else {
113 let mut non_cached_query_ranges = query_ranges;
114 non_cached_query_ranges.before_visible = non_cached_query_ranges
115 .before_visible
116 .into_iter()
117 .flat_map(|query_range| {
118 self.remove_cached_ranges_from_query(buffer_snapshot, query_range)
119 })
120 .collect();
121 non_cached_query_ranges.visible = non_cached_query_ranges
122 .visible
123 .into_iter()
124 .flat_map(|query_range| {
125 self.remove_cached_ranges_from_query(buffer_snapshot, query_range)
126 })
127 .collect();
128 non_cached_query_ranges.after_visible = non_cached_query_ranges
129 .after_visible
130 .into_iter()
131 .flat_map(|query_range| {
132 self.remove_cached_ranges_from_query(buffer_snapshot, query_range)
133 })
134 .collect();
135 non_cached_query_ranges
136 };
137
138 if !query_ranges.is_empty() {
139 self.tasks.push(spawn_task(query_ranges));
140 }
141 }
142
143 fn remove_cached_ranges_from_query(
144 &mut self,
145 buffer_snapshot: &BufferSnapshot,
146 query_range: Range<language::Anchor>,
147 ) -> Vec<Range<language::Anchor>> {
148 let mut ranges_to_query = Vec::new();
149 let mut latest_cached_range = None::<&mut Range<language::Anchor>>;
150 for cached_range in self
151 .sorted_ranges
152 .iter_mut()
153 .skip_while(|cached_range| {
154 cached_range
155 .end
156 .cmp(&query_range.start, buffer_snapshot)
157 .is_lt()
158 })
159 .take_while(|cached_range| {
160 cached_range
161 .start
162 .cmp(&query_range.end, buffer_snapshot)
163 .is_le()
164 })
165 {
166 match latest_cached_range {
167 Some(latest_cached_range) => {
168 if latest_cached_range.end.offset.saturating_add(1) < cached_range.start.offset
169 {
170 ranges_to_query.push(latest_cached_range.end..cached_range.start);
171 cached_range.start = latest_cached_range.end;
172 }
173 }
174 None => {
175 if query_range
176 .start
177 .cmp(&cached_range.start, buffer_snapshot)
178 .is_lt()
179 {
180 ranges_to_query.push(query_range.start..cached_range.start);
181 cached_range.start = query_range.start;
182 }
183 }
184 }
185 latest_cached_range = Some(cached_range);
186 }
187
188 match latest_cached_range {
189 Some(latest_cached_range) => {
190 if latest_cached_range.end.offset.saturating_add(1) < query_range.end.offset {
191 ranges_to_query.push(latest_cached_range.end..query_range.end);
192 latest_cached_range.end = query_range.end;
193 }
194 }
195 None => {
196 ranges_to_query.push(query_range.clone());
197 self.sorted_ranges.push(query_range);
198 self.sorted_ranges
199 .sort_by(|range_a, range_b| range_a.start.cmp(&range_b.start, buffer_snapshot));
200 }
201 }
202
203 ranges_to_query
204 }
205
206 fn invalidate_range(&mut self, buffer: &BufferSnapshot, range: &Range<language::Anchor>) {
207 self.sorted_ranges = self
208 .sorted_ranges
209 .drain(..)
210 .filter_map(|mut cached_range| {
211 if cached_range.start.cmp(&range.end, buffer).is_gt()
212 || cached_range.end.cmp(&range.start, buffer).is_lt()
213 {
214 Some(vec![cached_range])
215 } else if cached_range.start.cmp(&range.start, buffer).is_ge()
216 && cached_range.end.cmp(&range.end, buffer).is_le()
217 {
218 None
219 } else if range.start.cmp(&cached_range.start, buffer).is_ge()
220 && range.end.cmp(&cached_range.end, buffer).is_le()
221 {
222 Some(vec![
223 cached_range.start..range.start,
224 range.end..cached_range.end,
225 ])
226 } else if cached_range.start.cmp(&range.start, buffer).is_ge() {
227 cached_range.start = range.end;
228 Some(vec![cached_range])
229 } else {
230 cached_range.end = range.start;
231 Some(vec![cached_range])
232 }
233 })
234 .flatten()
235 .collect();
236 }
237}
238
239impl InlayHintCache {
240 pub fn new(inlay_hint_settings: InlayHintSettings) -> Self {
241 Self {
242 allowed_hint_kinds: inlay_hint_settings.enabled_inlay_hint_kinds(),
243 enabled: inlay_hint_settings.enabled,
244 hints: HashMap::default(),
245 update_tasks: HashMap::default(),
246 version: 0,
247 lsp_request_limiter: Arc::new(Semaphore::new(MAX_CONCURRENT_LSP_REQUESTS)),
248 }
249 }
250
251 pub fn update_settings(
252 &mut self,
253 multi_buffer: &Model<MultiBuffer>,
254 new_hint_settings: InlayHintSettings,
255 visible_hints: Vec<Inlay>,
256 cx: &mut ViewContext<Editor>,
257 ) -> ControlFlow<Option<InlaySplice>> {
258 let new_allowed_hint_kinds = new_hint_settings.enabled_inlay_hint_kinds();
259 match (self.enabled, new_hint_settings.enabled) {
260 (false, false) => {
261 self.allowed_hint_kinds = new_allowed_hint_kinds;
262 ControlFlow::Break(None)
263 }
264 (true, true) => {
265 if new_allowed_hint_kinds == self.allowed_hint_kinds {
266 ControlFlow::Break(None)
267 } else {
268 let new_splice = self.new_allowed_hint_kinds_splice(
269 multi_buffer,
270 &visible_hints,
271 &new_allowed_hint_kinds,
272 cx,
273 );
274 if new_splice.is_some() {
275 self.version += 1;
276 self.allowed_hint_kinds = new_allowed_hint_kinds;
277 }
278 ControlFlow::Break(new_splice)
279 }
280 }
281 (true, false) => {
282 self.enabled = new_hint_settings.enabled;
283 self.allowed_hint_kinds = new_allowed_hint_kinds;
284 if self.hints.is_empty() {
285 ControlFlow::Break(None)
286 } else {
287 self.clear();
288 ControlFlow::Break(Some(InlaySplice {
289 to_remove: visible_hints.iter().map(|inlay| inlay.id).collect(),
290 to_insert: Vec::new(),
291 }))
292 }
293 }
294 (false, true) => {
295 self.enabled = new_hint_settings.enabled;
296 self.allowed_hint_kinds = new_allowed_hint_kinds;
297 ControlFlow::Continue(())
298 }
299 }
300 }
301
302 pub fn spawn_hint_refresh(
303 &mut self,
304 reason: &'static str,
305 excerpts_to_query: HashMap<ExcerptId, (Model<Buffer>, Global, Range<usize>)>,
306 invalidate: InvalidationStrategy,
307 cx: &mut ViewContext<Editor>,
308 ) -> Option<InlaySplice> {
309 if !self.enabled {
310 return None;
311 }
312
313 let mut invalidated_hints = Vec::new();
314 if invalidate.should_invalidate() {
315 self.update_tasks
316 .retain(|task_excerpt_id, _| excerpts_to_query.contains_key(task_excerpt_id));
317 self.hints.retain(|cached_excerpt, cached_hints| {
318 let retain = excerpts_to_query.contains_key(cached_excerpt);
319 if !retain {
320 invalidated_hints.extend(cached_hints.read().ordered_hints.iter().copied());
321 }
322 retain
323 });
324 }
325 if excerpts_to_query.is_empty() && invalidated_hints.is_empty() {
326 return None;
327 }
328
329 let cache_version = self.version + 1;
330 cx.spawn(|editor, mut cx| async move {
331 editor
332 .update(&mut cx, |editor, cx| {
333 spawn_new_update_tasks(
334 editor,
335 reason,
336 excerpts_to_query,
337 invalidate,
338 cache_version,
339 cx,
340 )
341 })
342 .ok();
343 })
344 .detach();
345
346 if invalidated_hints.is_empty() {
347 None
348 } else {
349 Some(InlaySplice {
350 to_remove: invalidated_hints,
351 to_insert: Vec::new(),
352 })
353 }
354 }
355
356 fn new_allowed_hint_kinds_splice(
357 &self,
358 multi_buffer: &Model<MultiBuffer>,
359 visible_hints: &[Inlay],
360 new_kinds: &HashSet<Option<InlayHintKind>>,
361 cx: &mut ViewContext<Editor>,
362 ) -> Option<InlaySplice> {
363 let old_kinds = &self.allowed_hint_kinds;
364 if new_kinds == old_kinds {
365 return None;
366 }
367
368 let mut to_remove = Vec::new();
369 let mut to_insert = Vec::new();
370 let mut shown_hints_to_remove = visible_hints.iter().fold(
371 HashMap::<ExcerptId, Vec<(Anchor, InlayId)>>::default(),
372 |mut current_hints, inlay| {
373 current_hints
374 .entry(inlay.position.excerpt_id)
375 .or_default()
376 .push((inlay.position, inlay.id));
377 current_hints
378 },
379 );
380
381 let multi_buffer = multi_buffer.read(cx);
382 let multi_buffer_snapshot = multi_buffer.snapshot(cx);
383
384 for (excerpt_id, excerpt_cached_hints) in &self.hints {
385 let shown_excerpt_hints_to_remove =
386 shown_hints_to_remove.entry(*excerpt_id).or_default();
387 let excerpt_cached_hints = excerpt_cached_hints.read();
388 let mut excerpt_cache = excerpt_cached_hints.ordered_hints.iter().fuse().peekable();
389 shown_excerpt_hints_to_remove.retain(|(shown_anchor, shown_hint_id)| {
390 let Some(buffer) = shown_anchor
391 .buffer_id
392 .and_then(|buffer_id| multi_buffer.buffer(buffer_id))
393 else {
394 return false;
395 };
396 let buffer_snapshot = buffer.read(cx).snapshot();
397 loop {
398 match excerpt_cache.peek() {
399 Some(&cached_hint_id) => {
400 let cached_hint = &excerpt_cached_hints.hints_by_id[cached_hint_id];
401 if cached_hint_id == shown_hint_id {
402 excerpt_cache.next();
403 return !new_kinds.contains(&cached_hint.kind);
404 }
405
406 match cached_hint
407 .position
408 .cmp(&shown_anchor.text_anchor, &buffer_snapshot)
409 {
410 cmp::Ordering::Less | cmp::Ordering::Equal => {
411 if !old_kinds.contains(&cached_hint.kind)
412 && new_kinds.contains(&cached_hint.kind)
413 {
414 to_insert.push(Inlay::hint(
415 cached_hint_id.id(),
416 multi_buffer_snapshot.anchor_in_excerpt(
417 *excerpt_id,
418 cached_hint.position,
419 ),
420 &cached_hint,
421 ));
422 }
423 excerpt_cache.next();
424 }
425 cmp::Ordering::Greater => return true,
426 }
427 }
428 None => return true,
429 }
430 }
431 });
432
433 for cached_hint_id in excerpt_cache {
434 let maybe_missed_cached_hint = &excerpt_cached_hints.hints_by_id[cached_hint_id];
435 let cached_hint_kind = maybe_missed_cached_hint.kind;
436 if !old_kinds.contains(&cached_hint_kind) && new_kinds.contains(&cached_hint_kind) {
437 to_insert.push(Inlay::hint(
438 cached_hint_id.id(),
439 multi_buffer_snapshot
440 .anchor_in_excerpt(*excerpt_id, maybe_missed_cached_hint.position),
441 &maybe_missed_cached_hint,
442 ));
443 }
444 }
445 }
446
447 to_remove.extend(
448 shown_hints_to_remove
449 .into_values()
450 .flatten()
451 .map(|(_, hint_id)| hint_id),
452 );
453 if to_remove.is_empty() && to_insert.is_empty() {
454 None
455 } else {
456 Some(InlaySplice {
457 to_remove,
458 to_insert,
459 })
460 }
461 }
462
463 pub fn remove_excerpts(&mut self, excerpts_removed: Vec<ExcerptId>) -> Option<InlaySplice> {
464 let mut to_remove = Vec::new();
465 for excerpt_to_remove in excerpts_removed {
466 self.update_tasks.remove(&excerpt_to_remove);
467 if let Some(cached_hints) = self.hints.remove(&excerpt_to_remove) {
468 let cached_hints = cached_hints.read();
469 to_remove.extend(cached_hints.ordered_hints.iter().copied());
470 }
471 }
472 if to_remove.is_empty() {
473 None
474 } else {
475 self.version += 1;
476 Some(InlaySplice {
477 to_remove,
478 to_insert: Vec::new(),
479 })
480 }
481 }
482
483 pub fn clear(&mut self) {
484 if !self.update_tasks.is_empty() || !self.hints.is_empty() {
485 self.version += 1;
486 }
487 self.update_tasks.clear();
488 self.hints.clear();
489 }
490
491 pub fn hint_by_id(&self, excerpt_id: ExcerptId, hint_id: InlayId) -> Option<InlayHint> {
492 self.hints
493 .get(&excerpt_id)?
494 .read()
495 .hints_by_id
496 .get(&hint_id)
497 .cloned()
498 }
499
500 pub fn hints(&self) -> Vec<InlayHint> {
501 let mut hints = Vec::new();
502 for excerpt_hints in self.hints.values() {
503 let excerpt_hints = excerpt_hints.read();
504 hints.extend(
505 excerpt_hints
506 .ordered_hints
507 .iter()
508 .map(|id| &excerpt_hints.hints_by_id[id])
509 .cloned(),
510 );
511 }
512 hints
513 }
514
515 pub fn version(&self) -> usize {
516 self.version
517 }
518
519 pub fn spawn_hint_resolve(
520 &self,
521 buffer_id: u64,
522 excerpt_id: ExcerptId,
523 id: InlayId,
524 cx: &mut ViewContext<'_, Editor>,
525 ) {
526 if let Some(excerpt_hints) = self.hints.get(&excerpt_id) {
527 let mut guard = excerpt_hints.write();
528 if let Some(cached_hint) = guard.hints_by_id.get_mut(&id) {
529 if let ResolveState::CanResolve(server_id, _) = &cached_hint.resolve_state {
530 let hint_to_resolve = cached_hint.clone();
531 let server_id = *server_id;
532 cached_hint.resolve_state = ResolveState::Resolving;
533 drop(guard);
534 cx.spawn(|editor, mut cx| async move {
535 let resolved_hint_task = editor.update(&mut cx, |editor, cx| {
536 editor
537 .buffer()
538 .read(cx)
539 .buffer(buffer_id)
540 .and_then(|buffer| {
541 let project = editor.project.as_ref()?;
542 Some(project.update(cx, |project, cx| {
543 project.resolve_inlay_hint(
544 hint_to_resolve,
545 buffer,
546 server_id,
547 cx,
548 )
549 }))
550 })
551 })?;
552 if let Some(resolved_hint_task) = resolved_hint_task {
553 let mut resolved_hint =
554 resolved_hint_task.await.context("hint resolve task")?;
555 editor.update(&mut cx, |editor, _| {
556 if let Some(excerpt_hints) =
557 editor.inlay_hint_cache.hints.get(&excerpt_id)
558 {
559 let mut guard = excerpt_hints.write();
560 if let Some(cached_hint) = guard.hints_by_id.get_mut(&id) {
561 if cached_hint.resolve_state == ResolveState::Resolving {
562 resolved_hint.resolve_state = ResolveState::Resolved;
563 *cached_hint = resolved_hint;
564 }
565 }
566 }
567 })?;
568 }
569
570 anyhow::Ok(())
571 })
572 .detach_and_log_err(cx);
573 }
574 }
575 }
576 }
577}
578
579fn spawn_new_update_tasks(
580 editor: &mut Editor,
581 reason: &'static str,
582 excerpts_to_query: HashMap<ExcerptId, (Model<Buffer>, Global, Range<usize>)>,
583 invalidate: InvalidationStrategy,
584 update_cache_version: usize,
585 cx: &mut ViewContext<'_, Editor>,
586) {
587 let visible_hints = Arc::new(editor.visible_inlay_hints(cx));
588 for (excerpt_id, (excerpt_buffer, new_task_buffer_version, excerpt_visible_range)) in
589 excerpts_to_query
590 {
591 if excerpt_visible_range.is_empty() {
592 continue;
593 }
594 let buffer = excerpt_buffer.read(cx);
595 let buffer_id = buffer.remote_id();
596 let buffer_snapshot = buffer.snapshot();
597 if buffer_snapshot
598 .version()
599 .changed_since(&new_task_buffer_version)
600 {
601 continue;
602 }
603
604 let cached_excerpt_hints = editor.inlay_hint_cache.hints.get(&excerpt_id).cloned();
605 if let Some(cached_excerpt_hints) = &cached_excerpt_hints {
606 let cached_excerpt_hints = cached_excerpt_hints.read();
607 let cached_buffer_version = &cached_excerpt_hints.buffer_version;
608 if cached_excerpt_hints.version > update_cache_version
609 || cached_buffer_version.changed_since(&new_task_buffer_version)
610 {
611 continue;
612 }
613 };
614
615 let (multi_buffer_snapshot, Some(query_ranges)) =
616 editor.buffer.update(cx, |multi_buffer, cx| {
617 (
618 multi_buffer.snapshot(cx),
619 determine_query_ranges(
620 multi_buffer,
621 excerpt_id,
622 &excerpt_buffer,
623 excerpt_visible_range,
624 cx,
625 ),
626 )
627 })
628 else {
629 return;
630 };
631 let query = ExcerptQuery {
632 buffer_id,
633 excerpt_id,
634 cache_version: update_cache_version,
635 invalidate,
636 reason,
637 };
638
639 let new_update_task = |query_ranges| {
640 new_update_task(
641 query,
642 query_ranges,
643 multi_buffer_snapshot,
644 buffer_snapshot.clone(),
645 Arc::clone(&visible_hints),
646 cached_excerpt_hints,
647 Arc::clone(&editor.inlay_hint_cache.lsp_request_limiter),
648 cx,
649 )
650 };
651
652 match editor.inlay_hint_cache.update_tasks.entry(excerpt_id) {
653 hash_map::Entry::Occupied(mut o) => {
654 o.get_mut().update_cached_tasks(
655 &buffer_snapshot,
656 query_ranges,
657 invalidate,
658 new_update_task,
659 );
660 }
661 hash_map::Entry::Vacant(v) => {
662 v.insert(TasksForRanges::new(
663 query_ranges.clone(),
664 new_update_task(query_ranges),
665 ));
666 }
667 }
668 }
669}
670
671#[derive(Debug, Clone)]
672struct QueryRanges {
673 before_visible: Vec<Range<language::Anchor>>,
674 visible: Vec<Range<language::Anchor>>,
675 after_visible: Vec<Range<language::Anchor>>,
676}
677
678impl QueryRanges {
679 fn is_empty(&self) -> bool {
680 self.before_visible.is_empty() && self.visible.is_empty() && self.after_visible.is_empty()
681 }
682}
683
684fn determine_query_ranges(
685 multi_buffer: &mut MultiBuffer,
686 excerpt_id: ExcerptId,
687 excerpt_buffer: &Model<Buffer>,
688 excerpt_visible_range: Range<usize>,
689 cx: &mut ModelContext<'_, MultiBuffer>,
690) -> Option<QueryRanges> {
691 let full_excerpt_range = multi_buffer
692 .excerpts_for_buffer(excerpt_buffer, cx)
693 .into_iter()
694 .find(|(id, _)| id == &excerpt_id)
695 .map(|(_, range)| range.context)?;
696 let buffer = excerpt_buffer.read(cx);
697 let snapshot = buffer.snapshot();
698 let excerpt_visible_len = excerpt_visible_range.end - excerpt_visible_range.start;
699
700 let visible_range = if excerpt_visible_range.start == excerpt_visible_range.end {
701 return None;
702 } else {
703 vec![
704 buffer.anchor_before(snapshot.clip_offset(excerpt_visible_range.start, Bias::Left))
705 ..buffer.anchor_after(snapshot.clip_offset(excerpt_visible_range.end, Bias::Right)),
706 ]
707 };
708
709 let full_excerpt_range_end_offset = full_excerpt_range.end.to_offset(&snapshot);
710 let after_visible_range_start = excerpt_visible_range
711 .end
712 .saturating_add(1)
713 .min(full_excerpt_range_end_offset)
714 .min(buffer.len());
715 let after_visible_range = if after_visible_range_start == full_excerpt_range_end_offset {
716 Vec::new()
717 } else {
718 let after_range_end_offset = after_visible_range_start
719 .saturating_add(excerpt_visible_len)
720 .min(full_excerpt_range_end_offset)
721 .min(buffer.len());
722 vec![
723 buffer.anchor_before(snapshot.clip_offset(after_visible_range_start, Bias::Left))
724 ..buffer.anchor_after(snapshot.clip_offset(after_range_end_offset, Bias::Right)),
725 ]
726 };
727
728 let full_excerpt_range_start_offset = full_excerpt_range.start.to_offset(&snapshot);
729 let before_visible_range_end = excerpt_visible_range
730 .start
731 .saturating_sub(1)
732 .max(full_excerpt_range_start_offset);
733 let before_visible_range = if before_visible_range_end == full_excerpt_range_start_offset {
734 Vec::new()
735 } else {
736 let before_range_start_offset = before_visible_range_end
737 .saturating_sub(excerpt_visible_len)
738 .max(full_excerpt_range_start_offset);
739 vec![
740 buffer.anchor_before(snapshot.clip_offset(before_range_start_offset, Bias::Left))
741 ..buffer.anchor_after(snapshot.clip_offset(before_visible_range_end, Bias::Right)),
742 ]
743 };
744
745 Some(QueryRanges {
746 before_visible: before_visible_range,
747 visible: visible_range,
748 after_visible: after_visible_range,
749 })
750}
751
752const MAX_CONCURRENT_LSP_REQUESTS: usize = 5;
753const INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS: u64 = 400;
754
755fn new_update_task(
756 query: ExcerptQuery,
757 query_ranges: QueryRanges,
758 multi_buffer_snapshot: MultiBufferSnapshot,
759 buffer_snapshot: BufferSnapshot,
760 visible_hints: Arc<Vec<Inlay>>,
761 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
762 lsp_request_limiter: Arc<Semaphore>,
763 cx: &mut ViewContext<'_, Editor>,
764) -> Task<()> {
765 cx.spawn(|editor, mut cx| async move {
766 let closure_cx = cx.clone();
767 let fetch_and_update_hints = |invalidate, range| {
768 fetch_and_update_hints(
769 editor.clone(),
770 multi_buffer_snapshot.clone(),
771 buffer_snapshot.clone(),
772 Arc::clone(&visible_hints),
773 cached_excerpt_hints.as_ref().map(Arc::clone),
774 query,
775 invalidate,
776 range,
777 Arc::clone(&lsp_request_limiter),
778 closure_cx.clone(),
779 )
780 };
781 let visible_range_update_results = future::join_all(query_ranges.visible.into_iter().map(
782 |visible_range| async move {
783 (
784 visible_range.clone(),
785 fetch_and_update_hints(query.invalidate.should_invalidate(), visible_range)
786 .await,
787 )
788 },
789 ))
790 .await;
791
792 let hint_delay = cx.background_executor().timer(Duration::from_millis(
793 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS,
794 ));
795
796 let mut query_range_failed = |range: &Range<language::Anchor>, e: anyhow::Error| {
797 log::error!("inlay hint update task for range {range:?} failed: {e:#}");
798 editor
799 .update(&mut cx, |editor, _| {
800 if let Some(task_ranges) = editor
801 .inlay_hint_cache
802 .update_tasks
803 .get_mut(&query.excerpt_id)
804 {
805 task_ranges.invalidate_range(&buffer_snapshot, &range);
806 }
807 })
808 .ok()
809 };
810
811 for (range, result) in visible_range_update_results {
812 if let Err(e) = result {
813 query_range_failed(&range, e);
814 }
815 }
816
817 hint_delay.await;
818 let invisible_range_update_results = future::join_all(
819 query_ranges
820 .before_visible
821 .into_iter()
822 .chain(query_ranges.after_visible.into_iter())
823 .map(|invisible_range| async move {
824 (
825 invisible_range.clone(),
826 fetch_and_update_hints(false, invisible_range).await,
827 )
828 }),
829 )
830 .await;
831 for (range, result) in invisible_range_update_results {
832 if let Err(e) = result {
833 query_range_failed(&range, e);
834 }
835 }
836 })
837}
838
839async fn fetch_and_update_hints(
840 editor: gpui::WeakView<Editor>,
841 multi_buffer_snapshot: MultiBufferSnapshot,
842 buffer_snapshot: BufferSnapshot,
843 visible_hints: Arc<Vec<Inlay>>,
844 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
845 query: ExcerptQuery,
846 invalidate: bool,
847 fetch_range: Range<language::Anchor>,
848 lsp_request_limiter: Arc<Semaphore>,
849 mut cx: gpui::AsyncWindowContext,
850) -> anyhow::Result<()> {
851 let (lsp_request_guard, got_throttled) = if query.invalidate.should_invalidate() {
852 (None, false)
853 } else {
854 match lsp_request_limiter.try_acquire() {
855 Some(guard) => (Some(guard), false),
856 None => (Some(lsp_request_limiter.acquire().await), true),
857 }
858 };
859 let fetch_range_to_log =
860 fetch_range.start.to_point(&buffer_snapshot)..fetch_range.end.to_point(&buffer_snapshot);
861 let inlay_hints_fetch_task = editor
862 .update(&mut cx, |editor, cx| {
863 if got_throttled {
864 let query_not_around_visible_range = match editor.excerpt_visible_offsets(None, cx).remove(&query.excerpt_id) {
865 Some((_, _, current_visible_range)) => {
866 let visible_offset_length = current_visible_range.len();
867 let double_visible_range = current_visible_range
868 .start
869 .saturating_sub(visible_offset_length)
870 ..current_visible_range
871 .end
872 .saturating_add(visible_offset_length)
873 .min(buffer_snapshot.len());
874 !double_visible_range
875 .contains(&fetch_range.start.to_offset(&buffer_snapshot))
876 && !double_visible_range
877 .contains(&fetch_range.end.to_offset(&buffer_snapshot))
878 },
879 None => true,
880 };
881 if query_not_around_visible_range {
882 log::trace!("Fetching inlay hints for range {fetch_range_to_log:?} got throttled and fell off the current visible range, skipping.");
883 if let Some(task_ranges) = editor
884 .inlay_hint_cache
885 .update_tasks
886 .get_mut(&query.excerpt_id)
887 {
888 task_ranges.invalidate_range(&buffer_snapshot, &fetch_range);
889 }
890 return None;
891 }
892 }
893 editor
894 .buffer()
895 .read(cx)
896 .buffer(query.buffer_id)
897 .and_then(|buffer| {
898 let project = editor.project.as_ref()?;
899 Some(project.update(cx, |project, cx| {
900 project.inlay_hints(buffer, fetch_range.clone(), cx)
901 }))
902 })
903 })
904 .ok()
905 .flatten();
906 let new_hints = match inlay_hints_fetch_task {
907 Some(fetch_task) => {
908 log::debug!(
909 "Fetching inlay hints for range {fetch_range_to_log:?}, reason: {query_reason}, invalidate: {invalidate}",
910 query_reason = query.reason,
911 );
912 log::trace!(
913 "Currently visible hints: {visible_hints:?}, cached hints present: {}",
914 cached_excerpt_hints.is_some(),
915 );
916 fetch_task.await.context("inlay hint fetch task")?
917 }
918 None => return Ok(()),
919 };
920 drop(lsp_request_guard);
921 log::debug!(
922 "Fetched {} hints for range {fetch_range_to_log:?}",
923 new_hints.len()
924 );
925 log::trace!("Fetched hints: {new_hints:?}");
926
927 let background_task_buffer_snapshot = buffer_snapshot.clone();
928 let backround_fetch_range = fetch_range.clone();
929 let new_update = cx
930 .background_executor()
931 .spawn(async move {
932 calculate_hint_updates(
933 query.excerpt_id,
934 invalidate,
935 backround_fetch_range,
936 new_hints,
937 &background_task_buffer_snapshot,
938 cached_excerpt_hints,
939 &visible_hints,
940 )
941 })
942 .await;
943 if let Some(new_update) = new_update {
944 log::debug!(
945 "Applying update for range {fetch_range_to_log:?}: remove from editor: {}, remove from cache: {}, add to cache: {}",
946 new_update.remove_from_visible.len(),
947 new_update.remove_from_cache.len(),
948 new_update.add_to_cache.len()
949 );
950 log::trace!("New update: {new_update:?}");
951 editor
952 .update(&mut cx, |editor, cx| {
953 apply_hint_update(
954 editor,
955 new_update,
956 query,
957 invalidate,
958 buffer_snapshot,
959 multi_buffer_snapshot,
960 cx,
961 );
962 })
963 .ok();
964 }
965 Ok(())
966}
967
968fn calculate_hint_updates(
969 excerpt_id: ExcerptId,
970 invalidate: bool,
971 fetch_range: Range<language::Anchor>,
972 new_excerpt_hints: Vec<InlayHint>,
973 buffer_snapshot: &BufferSnapshot,
974 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
975 visible_hints: &[Inlay],
976) -> Option<ExcerptHintsUpdate> {
977 let mut add_to_cache = Vec::<InlayHint>::new();
978 let mut excerpt_hints_to_persist = HashMap::default();
979 for new_hint in new_excerpt_hints {
980 if !contains_position(&fetch_range, new_hint.position, buffer_snapshot) {
981 continue;
982 }
983 let missing_from_cache = match &cached_excerpt_hints {
984 Some(cached_excerpt_hints) => {
985 let cached_excerpt_hints = cached_excerpt_hints.read();
986 match cached_excerpt_hints
987 .ordered_hints
988 .binary_search_by(|probe| {
989 cached_excerpt_hints.hints_by_id[probe]
990 .position
991 .cmp(&new_hint.position, buffer_snapshot)
992 }) {
993 Ok(ix) => {
994 let mut missing_from_cache = true;
995 for id in &cached_excerpt_hints.ordered_hints[ix..] {
996 let cached_hint = &cached_excerpt_hints.hints_by_id[id];
997 if new_hint
998 .position
999 .cmp(&cached_hint.position, buffer_snapshot)
1000 .is_gt()
1001 {
1002 break;
1003 }
1004 if cached_hint == &new_hint {
1005 excerpt_hints_to_persist.insert(*id, cached_hint.kind);
1006 missing_from_cache = false;
1007 }
1008 }
1009 missing_from_cache
1010 }
1011 Err(_) => true,
1012 }
1013 }
1014 None => true,
1015 };
1016 if missing_from_cache {
1017 add_to_cache.push(new_hint);
1018 }
1019 }
1020
1021 let mut remove_from_visible = Vec::new();
1022 let mut remove_from_cache = HashSet::default();
1023 if invalidate {
1024 remove_from_visible.extend(
1025 visible_hints
1026 .iter()
1027 .filter(|hint| hint.position.excerpt_id == excerpt_id)
1028 .map(|inlay_hint| inlay_hint.id)
1029 .filter(|hint_id| !excerpt_hints_to_persist.contains_key(hint_id)),
1030 );
1031
1032 if let Some(cached_excerpt_hints) = &cached_excerpt_hints {
1033 let cached_excerpt_hints = cached_excerpt_hints.read();
1034 remove_from_cache.extend(
1035 cached_excerpt_hints
1036 .ordered_hints
1037 .iter()
1038 .filter(|cached_inlay_id| {
1039 !excerpt_hints_to_persist.contains_key(cached_inlay_id)
1040 })
1041 .copied(),
1042 );
1043 }
1044 }
1045
1046 if remove_from_visible.is_empty() && remove_from_cache.is_empty() && add_to_cache.is_empty() {
1047 None
1048 } else {
1049 Some(ExcerptHintsUpdate {
1050 excerpt_id,
1051 remove_from_visible,
1052 remove_from_cache,
1053 add_to_cache,
1054 })
1055 }
1056}
1057
1058fn contains_position(
1059 range: &Range<language::Anchor>,
1060 position: language::Anchor,
1061 buffer_snapshot: &BufferSnapshot,
1062) -> bool {
1063 range.start.cmp(&position, buffer_snapshot).is_le()
1064 && range.end.cmp(&position, buffer_snapshot).is_ge()
1065}
1066
1067fn apply_hint_update(
1068 editor: &mut Editor,
1069 new_update: ExcerptHintsUpdate,
1070 query: ExcerptQuery,
1071 invalidate: bool,
1072 buffer_snapshot: BufferSnapshot,
1073 multi_buffer_snapshot: MultiBufferSnapshot,
1074 cx: &mut ViewContext<'_, Editor>,
1075) {
1076 let cached_excerpt_hints = editor
1077 .inlay_hint_cache
1078 .hints
1079 .entry(new_update.excerpt_id)
1080 .or_insert_with(|| {
1081 Arc::new(RwLock::new(CachedExcerptHints {
1082 version: query.cache_version,
1083 buffer_version: buffer_snapshot.version().clone(),
1084 buffer_id: query.buffer_id,
1085 ordered_hints: Vec::new(),
1086 hints_by_id: HashMap::default(),
1087 }))
1088 });
1089 let mut cached_excerpt_hints = cached_excerpt_hints.write();
1090 match query.cache_version.cmp(&cached_excerpt_hints.version) {
1091 cmp::Ordering::Less => return,
1092 cmp::Ordering::Greater | cmp::Ordering::Equal => {
1093 cached_excerpt_hints.version = query.cache_version;
1094 }
1095 }
1096
1097 let mut cached_inlays_changed = !new_update.remove_from_cache.is_empty();
1098 cached_excerpt_hints
1099 .ordered_hints
1100 .retain(|hint_id| !new_update.remove_from_cache.contains(hint_id));
1101 cached_excerpt_hints
1102 .hints_by_id
1103 .retain(|hint_id, _| !new_update.remove_from_cache.contains(hint_id));
1104 let mut splice = InlaySplice {
1105 to_remove: new_update.remove_from_visible,
1106 to_insert: Vec::new(),
1107 };
1108 for new_hint in new_update.add_to_cache {
1109 let insert_position = match cached_excerpt_hints
1110 .ordered_hints
1111 .binary_search_by(|probe| {
1112 cached_excerpt_hints.hints_by_id[probe]
1113 .position
1114 .cmp(&new_hint.position, &buffer_snapshot)
1115 }) {
1116 Ok(i) => {
1117 let mut insert_position = Some(i);
1118 for id in &cached_excerpt_hints.ordered_hints[i..] {
1119 let cached_hint = &cached_excerpt_hints.hints_by_id[id];
1120 if new_hint
1121 .position
1122 .cmp(&cached_hint.position, &buffer_snapshot)
1123 .is_gt()
1124 {
1125 break;
1126 }
1127 if cached_hint.text() == new_hint.text() {
1128 insert_position = None;
1129 break;
1130 }
1131 }
1132 insert_position
1133 }
1134 Err(i) => Some(i),
1135 };
1136
1137 if let Some(insert_position) = insert_position {
1138 let new_inlay_id = post_inc(&mut editor.next_inlay_id);
1139 if editor
1140 .inlay_hint_cache
1141 .allowed_hint_kinds
1142 .contains(&new_hint.kind)
1143 {
1144 let new_hint_position =
1145 multi_buffer_snapshot.anchor_in_excerpt(query.excerpt_id, new_hint.position);
1146 splice
1147 .to_insert
1148 .push(Inlay::hint(new_inlay_id, new_hint_position, &new_hint));
1149 }
1150 let new_id = InlayId::Hint(new_inlay_id);
1151 cached_excerpt_hints.hints_by_id.insert(new_id, new_hint);
1152 cached_excerpt_hints
1153 .ordered_hints
1154 .insert(insert_position, new_id);
1155 cached_inlays_changed = true;
1156 }
1157 }
1158 cached_excerpt_hints.buffer_version = buffer_snapshot.version().clone();
1159 drop(cached_excerpt_hints);
1160
1161 if invalidate {
1162 let mut outdated_excerpt_caches = HashSet::default();
1163 for (excerpt_id, excerpt_hints) in &editor.inlay_hint_cache().hints {
1164 let excerpt_hints = excerpt_hints.read();
1165 if excerpt_hints.buffer_id == query.buffer_id
1166 && excerpt_id != &query.excerpt_id
1167 && buffer_snapshot
1168 .version()
1169 .changed_since(&excerpt_hints.buffer_version)
1170 {
1171 outdated_excerpt_caches.insert(*excerpt_id);
1172 splice
1173 .to_remove
1174 .extend(excerpt_hints.ordered_hints.iter().copied());
1175 }
1176 }
1177 cached_inlays_changed |= !outdated_excerpt_caches.is_empty();
1178 editor
1179 .inlay_hint_cache
1180 .hints
1181 .retain(|excerpt_id, _| !outdated_excerpt_caches.contains(excerpt_id));
1182 }
1183
1184 let InlaySplice {
1185 to_remove,
1186 to_insert,
1187 } = splice;
1188 let displayed_inlays_changed = !to_remove.is_empty() || !to_insert.is_empty();
1189 if cached_inlays_changed || displayed_inlays_changed {
1190 editor.inlay_hint_cache.version += 1;
1191 }
1192 if displayed_inlays_changed {
1193 editor.splice_inlay_hints(to_remove, to_insert, cx)
1194 }
1195}
1196
1197#[cfg(test)]
1198pub mod tests {
1199 use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
1200
1201 use crate::{
1202 scroll::{autoscroll::Autoscroll, scroll_amount::ScrollAmount},
1203 ExcerptRange,
1204 };
1205 use futures::StreamExt;
1206 use gpui::{Context, TestAppContext, View, WindowHandle};
1207 use itertools::Itertools;
1208 use language::{
1209 language_settings::AllLanguageSettingsContent, FakeLspAdapter, Language, LanguageConfig,
1210 };
1211 use lsp::FakeLanguageServer;
1212 use parking_lot::Mutex;
1213 use project::{FakeFs, Project};
1214 use serde_json::json;
1215 use settings::SettingsStore;
1216 use text::{Point, ToPoint};
1217 use workspace::Workspace;
1218
1219 use crate::editor_tests::update_test_language_settings;
1220
1221 use super::*;
1222
1223 #[gpui::test]
1224 async fn test_basic_cache_update_with_duplicate_hints(cx: &mut gpui::TestAppContext) {
1225 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
1226 init_test(cx, |settings| {
1227 settings.defaults.inlay_hints = Some(InlayHintSettings {
1228 enabled: true,
1229 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1230 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1231 show_other_hints: allowed_hint_kinds.contains(&None),
1232 })
1233 });
1234
1235 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
1236 let lsp_request_count = Arc::new(AtomicU32::new(0));
1237 fake_server
1238 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1239 let task_lsp_request_count = Arc::clone(&lsp_request_count);
1240 async move {
1241 assert_eq!(
1242 params.text_document.uri,
1243 lsp::Url::from_file_path(file_with_hints).unwrap(),
1244 );
1245 let current_call_id =
1246 Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1247 let mut new_hints = Vec::with_capacity(2 * current_call_id as usize);
1248 for _ in 0..2 {
1249 let mut i = current_call_id;
1250 loop {
1251 new_hints.push(lsp::InlayHint {
1252 position: lsp::Position::new(0, i),
1253 label: lsp::InlayHintLabel::String(i.to_string()),
1254 kind: None,
1255 text_edits: None,
1256 tooltip: None,
1257 padding_left: None,
1258 padding_right: None,
1259 data: None,
1260 });
1261 if i == 0 {
1262 break;
1263 }
1264 i -= 1;
1265 }
1266 }
1267
1268 Ok(Some(new_hints))
1269 }
1270 })
1271 .next()
1272 .await;
1273 cx.executor().run_until_parked();
1274
1275 let mut edits_made = 1;
1276 editor.update(cx, |editor, cx| {
1277 let expected_hints = vec!["0".to_string()];
1278 assert_eq!(
1279 expected_hints,
1280 cached_hint_labels(editor),
1281 "Should get its first hints when opening the editor"
1282 );
1283 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1284 let inlay_cache = editor.inlay_hint_cache();
1285 assert_eq!(
1286 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1287 "Cache should use editor settings to get the allowed hint kinds"
1288 );
1289 assert_eq!(
1290 inlay_cache.version, edits_made,
1291 "The editor update the cache version after every cache/view change"
1292 );
1293 });
1294
1295 editor.update(cx, |editor, cx| {
1296 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1297 editor.handle_input("some change", cx);
1298 edits_made += 1;
1299 });
1300 cx.executor().run_until_parked();
1301 editor.update(cx, |editor, cx| {
1302 let expected_hints = vec!["0".to_string(), "1".to_string()];
1303 assert_eq!(
1304 expected_hints,
1305 cached_hint_labels(editor),
1306 "Should get new hints after an edit"
1307 );
1308 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1309 let inlay_cache = editor.inlay_hint_cache();
1310 assert_eq!(
1311 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1312 "Cache should use editor settings to get the allowed hint kinds"
1313 );
1314 assert_eq!(
1315 inlay_cache.version, edits_made,
1316 "The editor update the cache version after every cache/view change"
1317 );
1318 });
1319
1320 fake_server
1321 .request::<lsp::request::InlayHintRefreshRequest>(())
1322 .await
1323 .expect("inlay refresh request failed");
1324 edits_made += 1;
1325 cx.executor().run_until_parked();
1326 editor.update(cx, |editor, cx| {
1327 let expected_hints = vec!["0".to_string(), "1".to_string(), "2".to_string()];
1328 assert_eq!(
1329 expected_hints,
1330 cached_hint_labels(editor),
1331 "Should get new hints after hint refresh/ request"
1332 );
1333 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1334 let inlay_cache = editor.inlay_hint_cache();
1335 assert_eq!(
1336 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1337 "Cache should use editor settings to get the allowed hint kinds"
1338 );
1339 assert_eq!(
1340 inlay_cache.version, edits_made,
1341 "The editor update the cache version after every cache/view change"
1342 );
1343 });
1344 }
1345
1346 #[gpui::test]
1347 async fn test_cache_update_on_lsp_completion_tasks(cx: &mut gpui::TestAppContext) {
1348 init_test(cx, |settings| {
1349 settings.defaults.inlay_hints = Some(InlayHintSettings {
1350 enabled: true,
1351 show_type_hints: true,
1352 show_parameter_hints: true,
1353 show_other_hints: true,
1354 })
1355 });
1356
1357 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
1358 let lsp_request_count = Arc::new(AtomicU32::new(0));
1359 fake_server
1360 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1361 let task_lsp_request_count = Arc::clone(&lsp_request_count);
1362 async move {
1363 assert_eq!(
1364 params.text_document.uri,
1365 lsp::Url::from_file_path(file_with_hints).unwrap(),
1366 );
1367 let current_call_id =
1368 Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1369 Ok(Some(vec![lsp::InlayHint {
1370 position: lsp::Position::new(0, current_call_id),
1371 label: lsp::InlayHintLabel::String(current_call_id.to_string()),
1372 kind: None,
1373 text_edits: None,
1374 tooltip: None,
1375 padding_left: None,
1376 padding_right: None,
1377 data: None,
1378 }]))
1379 }
1380 })
1381 .next()
1382 .await;
1383 cx.executor().run_until_parked();
1384
1385 let mut edits_made = 1;
1386 editor.update(cx, |editor, cx| {
1387 let expected_hints = vec!["0".to_string()];
1388 assert_eq!(
1389 expected_hints,
1390 cached_hint_labels(editor),
1391 "Should get its first hints when opening the editor"
1392 );
1393 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1394 assert_eq!(
1395 editor.inlay_hint_cache().version,
1396 edits_made,
1397 "The editor update the cache version after every cache/view change"
1398 );
1399 });
1400
1401 let progress_token = "test_progress_token";
1402 fake_server
1403 .request::<lsp::request::WorkDoneProgressCreate>(lsp::WorkDoneProgressCreateParams {
1404 token: lsp::ProgressToken::String(progress_token.to_string()),
1405 })
1406 .await
1407 .expect("work done progress create request failed");
1408 cx.executor().run_until_parked();
1409 fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
1410 token: lsp::ProgressToken::String(progress_token.to_string()),
1411 value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
1412 lsp::WorkDoneProgressBegin::default(),
1413 )),
1414 });
1415 cx.executor().run_until_parked();
1416
1417 editor.update(cx, |editor, cx| {
1418 let expected_hints = vec!["0".to_string()];
1419 assert_eq!(
1420 expected_hints,
1421 cached_hint_labels(editor),
1422 "Should not update hints while the work task is running"
1423 );
1424 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1425 assert_eq!(
1426 editor.inlay_hint_cache().version,
1427 edits_made,
1428 "Should not update the cache while the work task is running"
1429 );
1430 });
1431
1432 fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
1433 token: lsp::ProgressToken::String(progress_token.to_string()),
1434 value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
1435 lsp::WorkDoneProgressEnd::default(),
1436 )),
1437 });
1438 cx.executor().run_until_parked();
1439
1440 edits_made += 1;
1441 editor.update(cx, |editor, cx| {
1442 let expected_hints = vec!["1".to_string()];
1443 assert_eq!(
1444 expected_hints,
1445 cached_hint_labels(editor),
1446 "New hints should be queried after the work task is done"
1447 );
1448 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1449 assert_eq!(
1450 editor.inlay_hint_cache().version,
1451 edits_made,
1452 "Cache version should udpate once after the work task is done"
1453 );
1454 });
1455 }
1456
1457 #[gpui::test]
1458 async fn test_no_hint_updates_for_unrelated_language_files(cx: &mut gpui::TestAppContext) {
1459 init_test(cx, |settings| {
1460 settings.defaults.inlay_hints = Some(InlayHintSettings {
1461 enabled: true,
1462 show_type_hints: true,
1463 show_parameter_hints: true,
1464 show_other_hints: true,
1465 })
1466 });
1467
1468 let fs = FakeFs::new(cx.background_executor.clone());
1469 fs.insert_tree(
1470 "/a",
1471 json!({
1472 "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
1473 "other.md": "Test md file with some text",
1474 }),
1475 )
1476 .await;
1477 let project = Project::test(fs, ["/a".as_ref()], cx).await;
1478
1479 let mut rs_fake_servers = None;
1480 let mut md_fake_servers = None;
1481 for (name, path_suffix) in [("Rust", "rs"), ("Markdown", "md")] {
1482 let mut language = Language::new(
1483 LanguageConfig {
1484 name: name.into(),
1485 path_suffixes: vec![path_suffix.to_string()],
1486 ..Default::default()
1487 },
1488 Some(tree_sitter_rust::language()),
1489 );
1490 let fake_servers = language
1491 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
1492 name,
1493 capabilities: lsp::ServerCapabilities {
1494 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
1495 ..Default::default()
1496 },
1497 ..Default::default()
1498 }))
1499 .await;
1500 match name {
1501 "Rust" => rs_fake_servers = Some(fake_servers),
1502 "Markdown" => md_fake_servers = Some(fake_servers),
1503 _ => unreachable!(),
1504 }
1505 project.update(cx, |project, _| {
1506 project.languages().add(Arc::new(language));
1507 });
1508 }
1509
1510 let rs_buffer = project
1511 .update(cx, |project, cx| {
1512 project.open_local_buffer("/a/main.rs", cx)
1513 })
1514 .await
1515 .unwrap();
1516 cx.executor().run_until_parked();
1517 cx.executor().start_waiting();
1518 let rs_fake_server = rs_fake_servers.unwrap().next().await.unwrap();
1519 let rs_editor =
1520 cx.add_window(|cx| Editor::for_buffer(rs_buffer, Some(project.clone()), cx));
1521 let rs_lsp_request_count = Arc::new(AtomicU32::new(0));
1522 rs_fake_server
1523 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1524 let task_lsp_request_count = Arc::clone(&rs_lsp_request_count);
1525 async move {
1526 assert_eq!(
1527 params.text_document.uri,
1528 lsp::Url::from_file_path("/a/main.rs").unwrap(),
1529 );
1530 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1531 Ok(Some(vec![lsp::InlayHint {
1532 position: lsp::Position::new(0, i),
1533 label: lsp::InlayHintLabel::String(i.to_string()),
1534 kind: None,
1535 text_edits: None,
1536 tooltip: None,
1537 padding_left: None,
1538 padding_right: None,
1539 data: None,
1540 }]))
1541 }
1542 })
1543 .next()
1544 .await;
1545 cx.executor().run_until_parked();
1546 rs_editor.update(cx, |editor, cx| {
1547 let expected_hints = vec!["0".to_string()];
1548 assert_eq!(
1549 expected_hints,
1550 cached_hint_labels(editor),
1551 "Should get its first hints when opening the editor"
1552 );
1553 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1554 assert_eq!(
1555 editor.inlay_hint_cache().version,
1556 1,
1557 "Rust editor update the cache version after every cache/view change"
1558 );
1559 });
1560
1561 cx.executor().run_until_parked();
1562 let md_buffer = project
1563 .update(cx, |project, cx| {
1564 project.open_local_buffer("/a/other.md", cx)
1565 })
1566 .await
1567 .unwrap();
1568 cx.executor().run_until_parked();
1569 cx.executor().start_waiting();
1570 let md_fake_server = md_fake_servers.unwrap().next().await.unwrap();
1571 let md_editor = cx.add_window(|cx| Editor::for_buffer(md_buffer, Some(project), cx));
1572 let md_lsp_request_count = Arc::new(AtomicU32::new(0));
1573 md_fake_server
1574 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1575 let task_lsp_request_count = Arc::clone(&md_lsp_request_count);
1576 async move {
1577 assert_eq!(
1578 params.text_document.uri,
1579 lsp::Url::from_file_path("/a/other.md").unwrap(),
1580 );
1581 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1582 Ok(Some(vec![lsp::InlayHint {
1583 position: lsp::Position::new(0, i),
1584 label: lsp::InlayHintLabel::String(i.to_string()),
1585 kind: None,
1586 text_edits: None,
1587 tooltip: None,
1588 padding_left: None,
1589 padding_right: None,
1590 data: None,
1591 }]))
1592 }
1593 })
1594 .next()
1595 .await;
1596 cx.executor().run_until_parked();
1597 md_editor.update(cx, |editor, cx| {
1598 let expected_hints = vec!["0".to_string()];
1599 assert_eq!(
1600 expected_hints,
1601 cached_hint_labels(editor),
1602 "Markdown editor should have a separate verison, repeating Rust editor rules"
1603 );
1604 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1605 assert_eq!(editor.inlay_hint_cache().version, 1);
1606 });
1607
1608 rs_editor.update(cx, |editor, cx| {
1609 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1610 editor.handle_input("some rs change", cx);
1611 });
1612 cx.executor().run_until_parked();
1613 rs_editor.update(cx, |editor, cx| {
1614 let expected_hints = vec!["1".to_string()];
1615 assert_eq!(
1616 expected_hints,
1617 cached_hint_labels(editor),
1618 "Rust inlay cache should change after the edit"
1619 );
1620 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1621 assert_eq!(
1622 editor.inlay_hint_cache().version,
1623 2,
1624 "Every time hint cache changes, cache version should be incremented"
1625 );
1626 });
1627 md_editor.update(cx, |editor, cx| {
1628 let expected_hints = vec!["0".to_string()];
1629 assert_eq!(
1630 expected_hints,
1631 cached_hint_labels(editor),
1632 "Markdown editor should not be affected by Rust editor changes"
1633 );
1634 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1635 assert_eq!(editor.inlay_hint_cache().version, 1);
1636 });
1637
1638 md_editor.update(cx, |editor, cx| {
1639 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1640 editor.handle_input("some md change", cx);
1641 });
1642 cx.executor().run_until_parked();
1643 md_editor.update(cx, |editor, cx| {
1644 let expected_hints = vec!["1".to_string()];
1645 assert_eq!(
1646 expected_hints,
1647 cached_hint_labels(editor),
1648 "Rust editor should not be affected by Markdown editor changes"
1649 );
1650 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1651 assert_eq!(editor.inlay_hint_cache().version, 2);
1652 });
1653 rs_editor.update(cx, |editor, cx| {
1654 let expected_hints = vec!["1".to_string()];
1655 assert_eq!(
1656 expected_hints,
1657 cached_hint_labels(editor),
1658 "Markdown editor should also change independently"
1659 );
1660 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1661 assert_eq!(editor.inlay_hint_cache().version, 2);
1662 });
1663 }
1664
1665 #[gpui::test]
1666 async fn test_hint_setting_changes(cx: &mut gpui::TestAppContext) {
1667 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
1668 init_test(cx, |settings| {
1669 settings.defaults.inlay_hints = Some(InlayHintSettings {
1670 enabled: true,
1671 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1672 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1673 show_other_hints: allowed_hint_kinds.contains(&None),
1674 })
1675 });
1676
1677 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
1678 let lsp_request_count = Arc::new(AtomicU32::new(0));
1679 let another_lsp_request_count = Arc::clone(&lsp_request_count);
1680 fake_server
1681 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1682 let task_lsp_request_count = Arc::clone(&another_lsp_request_count);
1683 async move {
1684 Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1685 assert_eq!(
1686 params.text_document.uri,
1687 lsp::Url::from_file_path(file_with_hints).unwrap(),
1688 );
1689 Ok(Some(vec![
1690 lsp::InlayHint {
1691 position: lsp::Position::new(0, 1),
1692 label: lsp::InlayHintLabel::String("type hint".to_string()),
1693 kind: Some(lsp::InlayHintKind::TYPE),
1694 text_edits: None,
1695 tooltip: None,
1696 padding_left: None,
1697 padding_right: None,
1698 data: None,
1699 },
1700 lsp::InlayHint {
1701 position: lsp::Position::new(0, 2),
1702 label: lsp::InlayHintLabel::String("parameter hint".to_string()),
1703 kind: Some(lsp::InlayHintKind::PARAMETER),
1704 text_edits: None,
1705 tooltip: None,
1706 padding_left: None,
1707 padding_right: None,
1708 data: None,
1709 },
1710 lsp::InlayHint {
1711 position: lsp::Position::new(0, 3),
1712 label: lsp::InlayHintLabel::String("other hint".to_string()),
1713 kind: None,
1714 text_edits: None,
1715 tooltip: None,
1716 padding_left: None,
1717 padding_right: None,
1718 data: None,
1719 },
1720 ]))
1721 }
1722 })
1723 .next()
1724 .await;
1725 cx.executor().run_until_parked();
1726
1727 let mut edits_made = 1;
1728 editor.update(cx, |editor, cx| {
1729 assert_eq!(
1730 lsp_request_count.load(Ordering::Relaxed),
1731 1,
1732 "Should query new hints once"
1733 );
1734 assert_eq!(
1735 vec![
1736 "other hint".to_string(),
1737 "parameter hint".to_string(),
1738 "type hint".to_string(),
1739 ],
1740 cached_hint_labels(editor),
1741 "Should get its first hints when opening the editor"
1742 );
1743 assert_eq!(
1744 vec!["other hint".to_string(), "type hint".to_string()],
1745 visible_hint_labels(editor, cx)
1746 );
1747 let inlay_cache = editor.inlay_hint_cache();
1748 assert_eq!(
1749 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1750 "Cache should use editor settings to get the allowed hint kinds"
1751 );
1752 assert_eq!(
1753 inlay_cache.version, edits_made,
1754 "The editor update the cache version after every cache/view change"
1755 );
1756 });
1757
1758 fake_server
1759 .request::<lsp::request::InlayHintRefreshRequest>(())
1760 .await
1761 .expect("inlay refresh request failed");
1762 cx.executor().run_until_parked();
1763 editor.update(cx, |editor, cx| {
1764 assert_eq!(
1765 lsp_request_count.load(Ordering::Relaxed),
1766 2,
1767 "Should load new hints twice"
1768 );
1769 assert_eq!(
1770 vec![
1771 "other hint".to_string(),
1772 "parameter hint".to_string(),
1773 "type hint".to_string(),
1774 ],
1775 cached_hint_labels(editor),
1776 "Cached hints should not change due to allowed hint kinds settings update"
1777 );
1778 assert_eq!(
1779 vec!["other hint".to_string(), "type hint".to_string()],
1780 visible_hint_labels(editor, cx)
1781 );
1782 assert_eq!(
1783 editor.inlay_hint_cache().version,
1784 edits_made,
1785 "Should not update cache version due to new loaded hints being the same"
1786 );
1787 });
1788
1789 for (new_allowed_hint_kinds, expected_visible_hints) in [
1790 (HashSet::from_iter([None]), vec!["other hint".to_string()]),
1791 (
1792 HashSet::from_iter([Some(InlayHintKind::Type)]),
1793 vec!["type hint".to_string()],
1794 ),
1795 (
1796 HashSet::from_iter([Some(InlayHintKind::Parameter)]),
1797 vec!["parameter hint".to_string()],
1798 ),
1799 (
1800 HashSet::from_iter([None, Some(InlayHintKind::Type)]),
1801 vec!["other hint".to_string(), "type hint".to_string()],
1802 ),
1803 (
1804 HashSet::from_iter([None, Some(InlayHintKind::Parameter)]),
1805 vec!["other hint".to_string(), "parameter hint".to_string()],
1806 ),
1807 (
1808 HashSet::from_iter([Some(InlayHintKind::Type), Some(InlayHintKind::Parameter)]),
1809 vec!["parameter hint".to_string(), "type hint".to_string()],
1810 ),
1811 (
1812 HashSet::from_iter([
1813 None,
1814 Some(InlayHintKind::Type),
1815 Some(InlayHintKind::Parameter),
1816 ]),
1817 vec![
1818 "other hint".to_string(),
1819 "parameter hint".to_string(),
1820 "type hint".to_string(),
1821 ],
1822 ),
1823 ] {
1824 edits_made += 1;
1825 update_test_language_settings(cx, |settings| {
1826 settings.defaults.inlay_hints = Some(InlayHintSettings {
1827 enabled: true,
1828 show_type_hints: new_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1829 show_parameter_hints: new_allowed_hint_kinds
1830 .contains(&Some(InlayHintKind::Parameter)),
1831 show_other_hints: new_allowed_hint_kinds.contains(&None),
1832 })
1833 });
1834 cx.executor().run_until_parked();
1835 editor.update(cx, |editor, cx| {
1836 assert_eq!(
1837 lsp_request_count.load(Ordering::Relaxed),
1838 2,
1839 "Should not load new hints on allowed hint kinds change for hint kinds {new_allowed_hint_kinds:?}"
1840 );
1841 assert_eq!(
1842 vec![
1843 "other hint".to_string(),
1844 "parameter hint".to_string(),
1845 "type hint".to_string(),
1846 ],
1847 cached_hint_labels(editor),
1848 "Should get its cached hints unchanged after the settings change for hint kinds {new_allowed_hint_kinds:?}"
1849 );
1850 assert_eq!(
1851 expected_visible_hints,
1852 visible_hint_labels(editor, cx),
1853 "Should get its visible hints filtered after the settings change for hint kinds {new_allowed_hint_kinds:?}"
1854 );
1855 let inlay_cache = editor.inlay_hint_cache();
1856 assert_eq!(
1857 inlay_cache.allowed_hint_kinds, new_allowed_hint_kinds,
1858 "Cache should use editor settings to get the allowed hint kinds for hint kinds {new_allowed_hint_kinds:?}"
1859 );
1860 assert_eq!(
1861 inlay_cache.version, edits_made,
1862 "The editor should update the cache version after every cache/view change for hint kinds {new_allowed_hint_kinds:?} due to visible hints change"
1863 );
1864 });
1865 }
1866
1867 edits_made += 1;
1868 let another_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Type)]);
1869 update_test_language_settings(cx, |settings| {
1870 settings.defaults.inlay_hints = Some(InlayHintSettings {
1871 enabled: false,
1872 show_type_hints: another_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1873 show_parameter_hints: another_allowed_hint_kinds
1874 .contains(&Some(InlayHintKind::Parameter)),
1875 show_other_hints: another_allowed_hint_kinds.contains(&None),
1876 })
1877 });
1878 cx.executor().run_until_parked();
1879 editor.update(cx, |editor, cx| {
1880 assert_eq!(
1881 lsp_request_count.load(Ordering::Relaxed),
1882 2,
1883 "Should not load new hints when hints got disabled"
1884 );
1885 assert!(
1886 cached_hint_labels(editor).is_empty(),
1887 "Should clear the cache when hints got disabled"
1888 );
1889 assert!(
1890 visible_hint_labels(editor, cx).is_empty(),
1891 "Should clear visible hints when hints got disabled"
1892 );
1893 let inlay_cache = editor.inlay_hint_cache();
1894 assert_eq!(
1895 inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds,
1896 "Should update its allowed hint kinds even when hints got disabled"
1897 );
1898 assert_eq!(
1899 inlay_cache.version, edits_made,
1900 "The editor should update the cache version after hints got disabled"
1901 );
1902 });
1903
1904 fake_server
1905 .request::<lsp::request::InlayHintRefreshRequest>(())
1906 .await
1907 .expect("inlay refresh request failed");
1908 cx.executor().run_until_parked();
1909 editor.update(cx, |editor, cx| {
1910 assert_eq!(
1911 lsp_request_count.load(Ordering::Relaxed),
1912 2,
1913 "Should not load new hints when they got disabled"
1914 );
1915 assert!(cached_hint_labels(editor).is_empty());
1916 assert!(visible_hint_labels(editor, cx).is_empty());
1917 assert_eq!(
1918 editor.inlay_hint_cache().version, edits_made,
1919 "The editor should not update the cache version after /refresh query without updates"
1920 );
1921 });
1922
1923 let final_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Parameter)]);
1924 edits_made += 1;
1925 update_test_language_settings(cx, |settings| {
1926 settings.defaults.inlay_hints = Some(InlayHintSettings {
1927 enabled: true,
1928 show_type_hints: final_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1929 show_parameter_hints: final_allowed_hint_kinds
1930 .contains(&Some(InlayHintKind::Parameter)),
1931 show_other_hints: final_allowed_hint_kinds.contains(&None),
1932 })
1933 });
1934 cx.executor().run_until_parked();
1935 editor.update(cx, |editor, cx| {
1936 assert_eq!(
1937 lsp_request_count.load(Ordering::Relaxed),
1938 3,
1939 "Should query for new hints when they got reenabled"
1940 );
1941 assert_eq!(
1942 vec![
1943 "other hint".to_string(),
1944 "parameter hint".to_string(),
1945 "type hint".to_string(),
1946 ],
1947 cached_hint_labels(editor),
1948 "Should get its cached hints fully repopulated after the hints got reenabled"
1949 );
1950 assert_eq!(
1951 vec!["parameter hint".to_string()],
1952 visible_hint_labels(editor, cx),
1953 "Should get its visible hints repopulated and filtered after the h"
1954 );
1955 let inlay_cache = editor.inlay_hint_cache();
1956 assert_eq!(
1957 inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds,
1958 "Cache should update editor settings when hints got reenabled"
1959 );
1960 assert_eq!(
1961 inlay_cache.version, edits_made,
1962 "Cache should update its version after hints got reenabled"
1963 );
1964 });
1965
1966 fake_server
1967 .request::<lsp::request::InlayHintRefreshRequest>(())
1968 .await
1969 .expect("inlay refresh request failed");
1970 cx.executor().run_until_parked();
1971 editor.update(cx, |editor, cx| {
1972 assert_eq!(
1973 lsp_request_count.load(Ordering::Relaxed),
1974 4,
1975 "Should query for new hints again"
1976 );
1977 assert_eq!(
1978 vec![
1979 "other hint".to_string(),
1980 "parameter hint".to_string(),
1981 "type hint".to_string(),
1982 ],
1983 cached_hint_labels(editor),
1984 );
1985 assert_eq!(
1986 vec!["parameter hint".to_string()],
1987 visible_hint_labels(editor, cx),
1988 );
1989 assert_eq!(editor.inlay_hint_cache().version, edits_made);
1990 });
1991 }
1992
1993 #[gpui::test]
1994 async fn test_hint_request_cancellation(cx: &mut gpui::TestAppContext) {
1995 init_test(cx, |settings| {
1996 settings.defaults.inlay_hints = Some(InlayHintSettings {
1997 enabled: true,
1998 show_type_hints: true,
1999 show_parameter_hints: true,
2000 show_other_hints: true,
2001 })
2002 });
2003
2004 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
2005 let fake_server = Arc::new(fake_server);
2006 let lsp_request_count = Arc::new(AtomicU32::new(0));
2007 let another_lsp_request_count = Arc::clone(&lsp_request_count);
2008 fake_server
2009 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
2010 let task_lsp_request_count = Arc::clone(&another_lsp_request_count);
2011 async move {
2012 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
2013 assert_eq!(
2014 params.text_document.uri,
2015 lsp::Url::from_file_path(file_with_hints).unwrap(),
2016 );
2017 Ok(Some(vec![lsp::InlayHint {
2018 position: lsp::Position::new(0, i),
2019 label: lsp::InlayHintLabel::String(i.to_string()),
2020 kind: None,
2021 text_edits: None,
2022 tooltip: None,
2023 padding_left: None,
2024 padding_right: None,
2025 data: None,
2026 }]))
2027 }
2028 })
2029 .next()
2030 .await;
2031
2032 let mut expected_changes = Vec::new();
2033 for change_after_opening in [
2034 "initial change #1",
2035 "initial change #2",
2036 "initial change #3",
2037 ] {
2038 editor.update(cx, |editor, cx| {
2039 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
2040 editor.handle_input(change_after_opening, cx);
2041 });
2042 expected_changes.push(change_after_opening);
2043 }
2044
2045 cx.executor().run_until_parked();
2046
2047 editor.update(cx, |editor, cx| {
2048 let current_text = editor.text(cx);
2049 for change in &expected_changes {
2050 assert!(
2051 current_text.contains(change),
2052 "Should apply all changes made"
2053 );
2054 }
2055 assert_eq!(
2056 lsp_request_count.load(Ordering::Relaxed),
2057 2,
2058 "Should query new hints twice: for editor init and for the last edit that interrupted all others"
2059 );
2060 let expected_hints = vec!["2".to_string()];
2061 assert_eq!(
2062 expected_hints,
2063 cached_hint_labels(editor),
2064 "Should get hints from the last edit landed only"
2065 );
2066 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2067 assert_eq!(
2068 editor.inlay_hint_cache().version, 1,
2069 "Only one update should be registered in the cache after all cancellations"
2070 );
2071 });
2072
2073 let mut edits = Vec::new();
2074 for async_later_change in [
2075 "another change #1",
2076 "another change #2",
2077 "another change #3",
2078 ] {
2079 expected_changes.push(async_later_change);
2080 let task_editor = editor.clone();
2081 edits.push(cx.spawn(|mut cx| async move {
2082 task_editor.update(&mut cx, |editor, cx| {
2083 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
2084 editor.handle_input(async_later_change, cx);
2085 });
2086 }));
2087 }
2088 let _ = future::join_all(edits).await;
2089 cx.executor().run_until_parked();
2090
2091 editor.update(cx, |editor, cx| {
2092 let current_text = editor.text(cx);
2093 for change in &expected_changes {
2094 assert!(
2095 current_text.contains(change),
2096 "Should apply all changes made"
2097 );
2098 }
2099 assert_eq!(
2100 lsp_request_count.load(Ordering::SeqCst),
2101 3,
2102 "Should query new hints one more time, for the last edit only"
2103 );
2104 let expected_hints = vec!["3".to_string()];
2105 assert_eq!(
2106 expected_hints,
2107 cached_hint_labels(editor),
2108 "Should get hints from the last edit landed only"
2109 );
2110 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2111 assert_eq!(
2112 editor.inlay_hint_cache().version,
2113 2,
2114 "Should update the cache version once more, for the new change"
2115 );
2116 });
2117 }
2118
2119 #[gpui::test(iterations = 10)]
2120 async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) {
2121 init_test(cx, |settings| {
2122 settings.defaults.inlay_hints = Some(InlayHintSettings {
2123 enabled: true,
2124 show_type_hints: true,
2125 show_parameter_hints: true,
2126 show_other_hints: true,
2127 })
2128 });
2129
2130 let mut language = Language::new(
2131 LanguageConfig {
2132 name: "Rust".into(),
2133 path_suffixes: vec!["rs".to_string()],
2134 ..Default::default()
2135 },
2136 Some(tree_sitter_rust::language()),
2137 );
2138 let mut fake_servers = language
2139 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
2140 capabilities: lsp::ServerCapabilities {
2141 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
2142 ..Default::default()
2143 },
2144 ..Default::default()
2145 }))
2146 .await;
2147 let fs = FakeFs::new(cx.background_executor.clone());
2148 fs.insert_tree(
2149 "/a",
2150 json!({
2151 "main.rs": format!("fn main() {{\n{}\n}}", "let i = 5;\n".repeat(500)),
2152 "other.rs": "// Test file",
2153 }),
2154 )
2155 .await;
2156 let project = Project::test(fs, ["/a".as_ref()], cx).await;
2157 project.update(cx, |project, _| project.languages().add(Arc::new(language)));
2158 let buffer = project
2159 .update(cx, |project, cx| {
2160 project.open_local_buffer("/a/main.rs", cx)
2161 })
2162 .await
2163 .unwrap();
2164 cx.executor().run_until_parked();
2165 cx.executor().start_waiting();
2166 let fake_server = fake_servers.next().await.unwrap();
2167 let editor = cx.add_window(|cx| Editor::for_buffer(buffer, Some(project), cx));
2168 let lsp_request_ranges = Arc::new(Mutex::new(Vec::new()));
2169 let lsp_request_count = Arc::new(AtomicUsize::new(0));
2170 let closure_lsp_request_ranges = Arc::clone(&lsp_request_ranges);
2171 let closure_lsp_request_count = Arc::clone(&lsp_request_count);
2172 fake_server
2173 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
2174 let task_lsp_request_ranges = Arc::clone(&closure_lsp_request_ranges);
2175 let task_lsp_request_count = Arc::clone(&closure_lsp_request_count);
2176 async move {
2177 assert_eq!(
2178 params.text_document.uri,
2179 lsp::Url::from_file_path("/a/main.rs").unwrap(),
2180 );
2181
2182 task_lsp_request_ranges.lock().push(params.range);
2183 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::Release) + 1;
2184 Ok(Some(vec![lsp::InlayHint {
2185 position: params.range.end,
2186 label: lsp::InlayHintLabel::String(i.to_string()),
2187 kind: None,
2188 text_edits: None,
2189 tooltip: None,
2190 padding_left: None,
2191 padding_right: None,
2192 data: None,
2193 }]))
2194 }
2195 })
2196 .next()
2197 .await;
2198
2199 fn editor_visible_range(
2200 editor: &WindowHandle<Editor>,
2201 cx: &mut gpui::TestAppContext,
2202 ) -> Range<Point> {
2203 let ranges = editor
2204 .update(cx, |editor, cx| editor.excerpt_visible_offsets(None, cx))
2205 .unwrap();
2206 assert_eq!(
2207 ranges.len(),
2208 1,
2209 "Single buffer should produce a single excerpt with visible range"
2210 );
2211 let (_, (excerpt_buffer, _, excerpt_visible_range)) =
2212 ranges.into_iter().next().unwrap();
2213 excerpt_buffer.update(cx, |buffer, _| {
2214 let snapshot = buffer.snapshot();
2215 let start = buffer
2216 .anchor_before(excerpt_visible_range.start)
2217 .to_point(&snapshot);
2218 let end = buffer
2219 .anchor_after(excerpt_visible_range.end)
2220 .to_point(&snapshot);
2221 start..end
2222 })
2223 }
2224
2225 // in large buffers, requests are made for more than visible range of a buffer.
2226 // invisible parts are queried later, to avoid excessive requests on quick typing.
2227 // wait the timeout needed to get all requests.
2228 cx.executor().advance_clock(Duration::from_millis(
2229 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
2230 ));
2231 cx.executor().run_until_parked();
2232 let initial_visible_range = editor_visible_range(&editor, cx);
2233 let lsp_initial_visible_range = lsp::Range::new(
2234 lsp::Position::new(
2235 initial_visible_range.start.row,
2236 initial_visible_range.start.column,
2237 ),
2238 lsp::Position::new(
2239 initial_visible_range.end.row,
2240 initial_visible_range.end.column,
2241 ),
2242 );
2243 let expected_initial_query_range_end =
2244 lsp::Position::new(initial_visible_range.end.row * 2, 2);
2245 let mut expected_invisible_query_start = lsp_initial_visible_range.end;
2246 expected_invisible_query_start.character += 1;
2247 editor.update(cx, |editor, cx| {
2248 let ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
2249 assert_eq!(ranges.len(), 2,
2250 "When scroll is at the edge of a big document, its visible part and the same range further should be queried in order, but got: {ranges:?}");
2251 let visible_query_range = &ranges[0];
2252 assert_eq!(visible_query_range.start, lsp_initial_visible_range.start);
2253 assert_eq!(visible_query_range.end, lsp_initial_visible_range.end);
2254 let invisible_query_range = &ranges[1];
2255
2256 assert_eq!(invisible_query_range.start, expected_invisible_query_start, "Should initially query visible edge of the document");
2257 assert_eq!(invisible_query_range.end, expected_initial_query_range_end, "Should initially query visible edge of the document");
2258
2259 let requests_count = lsp_request_count.load(Ordering::Acquire);
2260 assert_eq!(requests_count, 2, "Visible + invisible request");
2261 let expected_hints = vec!["1".to_string(), "2".to_string()];
2262 assert_eq!(
2263 expected_hints,
2264 cached_hint_labels(editor),
2265 "Should have hints from both LSP requests made for a big file"
2266 );
2267 assert_eq!(expected_hints, visible_hint_labels(editor, cx), "Should display only hints from the visible range");
2268 assert_eq!(
2269 editor.inlay_hint_cache().version, requests_count,
2270 "LSP queries should've bumped the cache version"
2271 );
2272 });
2273
2274 editor.update(cx, |editor, cx| {
2275 editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
2276 editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
2277 });
2278 cx.executor().advance_clock(Duration::from_millis(
2279 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
2280 ));
2281 cx.executor().run_until_parked();
2282 let visible_range_after_scrolls = editor_visible_range(&editor, cx);
2283 let visible_line_count = editor
2284 .update(cx, |editor, _| editor.visible_line_count().unwrap())
2285 .unwrap();
2286 let selection_in_cached_range = editor
2287 .update(cx, |editor, cx| {
2288 let ranges = lsp_request_ranges
2289 .lock()
2290 .drain(..)
2291 .sorted_by_key(|r| r.start)
2292 .collect::<Vec<_>>();
2293 assert_eq!(
2294 ranges.len(),
2295 2,
2296 "Should query 2 ranges after both scrolls, but got: {ranges:?}"
2297 );
2298 let first_scroll = &ranges[0];
2299 let second_scroll = &ranges[1];
2300 assert_eq!(
2301 first_scroll.end, second_scroll.start,
2302 "Should query 2 adjacent ranges after the scrolls, but got: {ranges:?}"
2303 );
2304 assert_eq!(
2305 first_scroll.start, expected_initial_query_range_end,
2306 "First scroll should start the query right after the end of the original scroll",
2307 );
2308 assert_eq!(
2309 second_scroll.end,
2310 lsp::Position::new(
2311 visible_range_after_scrolls.end.row
2312 + visible_line_count.ceil() as u32,
2313 1,
2314 ),
2315 "Second scroll should query one more screen down after the end of the visible range"
2316 );
2317
2318 let lsp_requests = lsp_request_count.load(Ordering::Acquire);
2319 assert_eq!(lsp_requests, 4, "Should query for hints after every scroll");
2320 let expected_hints = vec![
2321 "1".to_string(),
2322 "2".to_string(),
2323 "3".to_string(),
2324 "4".to_string(),
2325 ];
2326 assert_eq!(
2327 expected_hints,
2328 cached_hint_labels(editor),
2329 "Should have hints from the new LSP response after the edit"
2330 );
2331 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2332 assert_eq!(
2333 editor.inlay_hint_cache().version,
2334 lsp_requests,
2335 "Should update the cache for every LSP response with hints added"
2336 );
2337
2338 let mut selection_in_cached_range = visible_range_after_scrolls.end;
2339 selection_in_cached_range.row -= visible_line_count.ceil() as u32;
2340 selection_in_cached_range
2341 })
2342 .unwrap();
2343
2344 editor.update(cx, |editor, cx| {
2345 editor.change_selections(Some(Autoscroll::center()), cx, |s| {
2346 s.select_ranges([selection_in_cached_range..selection_in_cached_range])
2347 });
2348 });
2349 cx.executor().advance_clock(Duration::from_millis(
2350 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
2351 ));
2352 cx.executor().run_until_parked();
2353 editor.update(cx, |_, _| {
2354 let ranges = lsp_request_ranges
2355 .lock()
2356 .drain(..)
2357 .sorted_by_key(|r| r.start)
2358 .collect::<Vec<_>>();
2359 assert!(ranges.is_empty(), "No new ranges or LSP queries should be made after returning to the selection with cached hints");
2360 assert_eq!(lsp_request_count.load(Ordering::Acquire), 4);
2361 });
2362
2363 editor.update(cx, |editor, cx| {
2364 editor.handle_input("++++more text++++", cx);
2365 });
2366 cx.executor().advance_clock(Duration::from_millis(
2367 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
2368 ));
2369 cx.executor().run_until_parked();
2370 editor.update(cx, |editor, cx| {
2371 let mut ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
2372 ranges.sort_by_key(|r| r.start);
2373
2374 assert_eq!(ranges.len(), 3,
2375 "On edit, should scroll to selection and query a range around it: visible + same range above and below. Instead, got query ranges {ranges:?}");
2376 let above_query_range = &ranges[0];
2377 let visible_query_range = &ranges[1];
2378 let below_query_range = &ranges[2];
2379 assert!(above_query_range.end.character < visible_query_range.start.character || above_query_range.end.line + 1 == visible_query_range.start.line,
2380 "Above range {above_query_range:?} should be before visible range {visible_query_range:?}");
2381 assert!(visible_query_range.end.character < below_query_range.start.character || visible_query_range.end.line + 1 == below_query_range.start.line,
2382 "Visible range {visible_query_range:?} should be before below range {below_query_range:?}");
2383 assert!(above_query_range.start.line < selection_in_cached_range.row,
2384 "Hints should be queried with the selected range after the query range start");
2385 assert!(below_query_range.end.line > selection_in_cached_range.row,
2386 "Hints should be queried with the selected range before the query range end");
2387 assert!(above_query_range.start.line <= selection_in_cached_range.row - (visible_line_count * 3.0 / 2.0) as u32,
2388 "Hints query range should contain one more screen before");
2389 assert!(below_query_range.end.line >= selection_in_cached_range.row + (visible_line_count * 3.0 / 2.0) as u32,
2390 "Hints query range should contain one more screen after");
2391
2392 let lsp_requests = lsp_request_count.load(Ordering::Acquire);
2393 assert_eq!(lsp_requests, 7, "There should be a visible range and two ranges above and below it queried");
2394 let expected_hints = vec!["5".to_string(), "6".to_string(), "7".to_string()];
2395 assert_eq!(expected_hints, cached_hint_labels(editor),
2396 "Should have hints from the new LSP response after the edit");
2397 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2398 assert_eq!(editor.inlay_hint_cache().version, lsp_requests, "Should update the cache for every LSP response with hints added");
2399 });
2400 }
2401
2402 #[gpui::test(iterations = 10)]
2403 async fn test_multiple_excerpts_large_multibuffer(cx: &mut gpui::TestAppContext) {
2404 init_test(cx, |settings| {
2405 settings.defaults.inlay_hints = Some(InlayHintSettings {
2406 enabled: true,
2407 show_type_hints: true,
2408 show_parameter_hints: true,
2409 show_other_hints: true,
2410 })
2411 });
2412
2413 let mut language = Language::new(
2414 LanguageConfig {
2415 name: "Rust".into(),
2416 path_suffixes: vec!["rs".to_string()],
2417 ..Default::default()
2418 },
2419 Some(tree_sitter_rust::language()),
2420 );
2421 let mut fake_servers = language
2422 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
2423 capabilities: lsp::ServerCapabilities {
2424 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
2425 ..Default::default()
2426 },
2427 ..Default::default()
2428 }))
2429 .await;
2430 let language = Arc::new(language);
2431 let fs = FakeFs::new(cx.background_executor.clone());
2432 fs.insert_tree(
2433 "/a",
2434 json!({
2435 "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
2436 "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::<Vec<_>>().join("")),
2437 }),
2438 )
2439 .await;
2440 let project = Project::test(fs, ["/a".as_ref()], cx).await;
2441 project.update(cx, |project, _| {
2442 project.languages().add(Arc::clone(&language))
2443 });
2444 let worktree_id = project.update(cx, |project, cx| {
2445 project.worktrees().next().unwrap().read(cx).id()
2446 });
2447
2448 let buffer_1 = project
2449 .update(cx, |project, cx| {
2450 project.open_buffer((worktree_id, "main.rs"), cx)
2451 })
2452 .await
2453 .unwrap();
2454 let buffer_2 = project
2455 .update(cx, |project, cx| {
2456 project.open_buffer((worktree_id, "other.rs"), cx)
2457 })
2458 .await
2459 .unwrap();
2460 let multibuffer = cx.build_model(|cx| {
2461 let mut multibuffer = MultiBuffer::new(0);
2462 multibuffer.push_excerpts(
2463 buffer_1.clone(),
2464 [
2465 ExcerptRange {
2466 context: Point::new(0, 0)..Point::new(2, 0),
2467 primary: None,
2468 },
2469 ExcerptRange {
2470 context: Point::new(4, 0)..Point::new(11, 0),
2471 primary: None,
2472 },
2473 ExcerptRange {
2474 context: Point::new(22, 0)..Point::new(33, 0),
2475 primary: None,
2476 },
2477 ExcerptRange {
2478 context: Point::new(44, 0)..Point::new(55, 0),
2479 primary: None,
2480 },
2481 ExcerptRange {
2482 context: Point::new(56, 0)..Point::new(66, 0),
2483 primary: None,
2484 },
2485 ExcerptRange {
2486 context: Point::new(67, 0)..Point::new(77, 0),
2487 primary: None,
2488 },
2489 ],
2490 cx,
2491 );
2492 multibuffer.push_excerpts(
2493 buffer_2.clone(),
2494 [
2495 ExcerptRange {
2496 context: Point::new(0, 1)..Point::new(2, 1),
2497 primary: None,
2498 },
2499 ExcerptRange {
2500 context: Point::new(4, 1)..Point::new(11, 1),
2501 primary: None,
2502 },
2503 ExcerptRange {
2504 context: Point::new(22, 1)..Point::new(33, 1),
2505 primary: None,
2506 },
2507 ExcerptRange {
2508 context: Point::new(44, 1)..Point::new(55, 1),
2509 primary: None,
2510 },
2511 ExcerptRange {
2512 context: Point::new(56, 1)..Point::new(66, 1),
2513 primary: None,
2514 },
2515 ExcerptRange {
2516 context: Point::new(67, 1)..Point::new(77, 1),
2517 primary: None,
2518 },
2519 ],
2520 cx,
2521 );
2522 multibuffer
2523 });
2524
2525 cx.executor().run_until_parked();
2526 let editor =
2527 cx.add_window(|cx| Editor::for_multibuffer(multibuffer, Some(project.clone()), cx));
2528 let editor_edited = Arc::new(AtomicBool::new(false));
2529 let fake_server = fake_servers.next().await.unwrap();
2530 let closure_editor_edited = Arc::clone(&editor_edited);
2531 fake_server
2532 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
2533 let task_editor_edited = Arc::clone(&closure_editor_edited);
2534 async move {
2535 let hint_text = if params.text_document.uri
2536 == lsp::Url::from_file_path("/a/main.rs").unwrap()
2537 {
2538 "main hint"
2539 } else if params.text_document.uri
2540 == lsp::Url::from_file_path("/a/other.rs").unwrap()
2541 {
2542 "other hint"
2543 } else {
2544 panic!("unexpected uri: {:?}", params.text_document.uri);
2545 };
2546
2547 // one hint per excerpt
2548 let positions = [
2549 lsp::Position::new(0, 2),
2550 lsp::Position::new(4, 2),
2551 lsp::Position::new(22, 2),
2552 lsp::Position::new(44, 2),
2553 lsp::Position::new(56, 2),
2554 lsp::Position::new(67, 2),
2555 ];
2556 let out_of_range_hint = lsp::InlayHint {
2557 position: lsp::Position::new(
2558 params.range.start.line + 99,
2559 params.range.start.character + 99,
2560 ),
2561 label: lsp::InlayHintLabel::String(
2562 "out of excerpt range, should be ignored".to_string(),
2563 ),
2564 kind: None,
2565 text_edits: None,
2566 tooltip: None,
2567 padding_left: None,
2568 padding_right: None,
2569 data: None,
2570 };
2571
2572 let edited = task_editor_edited.load(Ordering::Acquire);
2573 Ok(Some(
2574 std::iter::once(out_of_range_hint)
2575 .chain(positions.into_iter().enumerate().map(|(i, position)| {
2576 lsp::InlayHint {
2577 position,
2578 label: lsp::InlayHintLabel::String(format!(
2579 "{hint_text}{} #{i}",
2580 if edited { "(edited)" } else { "" },
2581 )),
2582 kind: None,
2583 text_edits: None,
2584 tooltip: None,
2585 padding_left: None,
2586 padding_right: None,
2587 data: None,
2588 }
2589 }))
2590 .collect(),
2591 ))
2592 }
2593 })
2594 .next()
2595 .await;
2596 cx.executor().run_until_parked();
2597
2598 editor.update(cx, |editor, cx| {
2599 let expected_hints = vec![
2600 "main hint #0".to_string(),
2601 "main hint #1".to_string(),
2602 "main hint #2".to_string(),
2603 "main hint #3".to_string(),
2604 // todo!() there used to be no these hints, but new gpui2 presumably scrolls a bit farther
2605 // (or renders less?) note that tests below pass
2606 "main hint #4".to_string(),
2607 "main hint #5".to_string(),
2608 ];
2609 assert_eq!(
2610 expected_hints,
2611 cached_hint_labels(editor),
2612 "When scroll is at the edge of a multibuffer, its visible excerpts only should be queried for inlay hints"
2613 );
2614 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2615 assert_eq!(editor.inlay_hint_cache().version, expected_hints.len(), "Every visible excerpt hints should bump the verison");
2616 });
2617
2618 editor.update(cx, |editor, cx| {
2619 editor.change_selections(Some(Autoscroll::Next), cx, |s| {
2620 s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
2621 });
2622 editor.change_selections(Some(Autoscroll::Next), cx, |s| {
2623 s.select_ranges([Point::new(22, 0)..Point::new(22, 0)])
2624 });
2625 editor.change_selections(Some(Autoscroll::Next), cx, |s| {
2626 s.select_ranges([Point::new(50, 0)..Point::new(50, 0)])
2627 });
2628 });
2629 cx.executor().run_until_parked();
2630 editor.update(cx, |editor, cx| {
2631 let expected_hints = vec![
2632 "main hint #0".to_string(),
2633 "main hint #1".to_string(),
2634 "main hint #2".to_string(),
2635 "main hint #3".to_string(),
2636 "main hint #4".to_string(),
2637 "main hint #5".to_string(),
2638 "other hint #0".to_string(),
2639 "other hint #1".to_string(),
2640 "other hint #2".to_string(),
2641 ];
2642 assert_eq!(expected_hints, cached_hint_labels(editor),
2643 "With more scrolls of the multibuffer, more hints should be added into the cache and nothing invalidated without edits");
2644 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2645 assert_eq!(editor.inlay_hint_cache().version, expected_hints.len(),
2646 "Due to every excerpt having one hint, we update cache per new excerpt scrolled");
2647 });
2648
2649 editor.update(cx, |editor, cx| {
2650 editor.change_selections(Some(Autoscroll::Next), cx, |s| {
2651 s.select_ranges([Point::new(100, 0)..Point::new(100, 0)])
2652 });
2653 });
2654 cx.executor().advance_clock(Duration::from_millis(
2655 INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
2656 ));
2657 cx.executor().run_until_parked();
2658 let last_scroll_update_version = editor.update(cx, |editor, cx| {
2659 let expected_hints = vec![
2660 "main hint #0".to_string(),
2661 "main hint #1".to_string(),
2662 "main hint #2".to_string(),
2663 "main hint #3".to_string(),
2664 "main hint #4".to_string(),
2665 "main hint #5".to_string(),
2666 "other hint #0".to_string(),
2667 "other hint #1".to_string(),
2668 "other hint #2".to_string(),
2669 "other hint #3".to_string(),
2670 "other hint #4".to_string(),
2671 "other hint #5".to_string(),
2672 ];
2673 assert_eq!(expected_hints, cached_hint_labels(editor),
2674 "After multibuffer was scrolled to the end, all hints for all excerpts should be fetched");
2675 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2676 assert_eq!(editor.inlay_hint_cache().version, expected_hints.len());
2677 expected_hints.len()
2678 }).unwrap();
2679
2680 editor.update(cx, |editor, cx| {
2681 editor.change_selections(Some(Autoscroll::Next), cx, |s| {
2682 s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
2683 });
2684 });
2685 cx.executor().run_until_parked();
2686 editor.update(cx, |editor, cx| {
2687 let expected_hints = vec![
2688 "main hint #0".to_string(),
2689 "main hint #1".to_string(),
2690 "main hint #2".to_string(),
2691 "main hint #3".to_string(),
2692 "main hint #4".to_string(),
2693 "main hint #5".to_string(),
2694 "other hint #0".to_string(),
2695 "other hint #1".to_string(),
2696 "other hint #2".to_string(),
2697 "other hint #3".to_string(),
2698 "other hint #4".to_string(),
2699 "other hint #5".to_string(),
2700 ];
2701 assert_eq!(expected_hints, cached_hint_labels(editor),
2702 "After multibuffer was scrolled to the end, further scrolls up should not bring more hints");
2703 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2704 assert_eq!(editor.inlay_hint_cache().version, last_scroll_update_version, "No updates should happen during scrolling already scolled buffer");
2705 });
2706
2707 editor_edited.store(true, Ordering::Release);
2708 editor.update(cx, |editor, cx| {
2709 editor.change_selections(None, cx, |s| {
2710 s.select_ranges([Point::new(56, 0)..Point::new(56, 0)])
2711 });
2712 editor.handle_input("++++more text++++", cx);
2713 });
2714 cx.executor().run_until_parked();
2715 editor.update(cx, |editor, cx| {
2716 let expected_hints = vec![
2717 "main hint(edited) #0".to_string(),
2718 "main hint(edited) #1".to_string(),
2719 "main hint(edited) #2".to_string(),
2720 "main hint(edited) #3".to_string(),
2721 "main hint(edited) #4".to_string(),
2722 "main hint(edited) #5".to_string(),
2723 "other hint(edited) #0".to_string(),
2724 "other hint(edited) #1".to_string(),
2725 ];
2726 assert_eq!(
2727 expected_hints,
2728 cached_hint_labels(editor),
2729 "After multibuffer edit, editor gets scolled back to the last selection; \
2730all hints should be invalidated and requeried for all of its visible excerpts"
2731 );
2732 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
2733
2734 let current_cache_version = editor.inlay_hint_cache().version;
2735 let minimum_expected_version = last_scroll_update_version + expected_hints.len();
2736 assert!(
2737 current_cache_version == minimum_expected_version || current_cache_version == minimum_expected_version + 1,
2738 "Due to every excerpt having one hint, cache should update per new excerpt received + 1 potential sporadic update"
2739 );
2740 });
2741 }
2742
2743 #[gpui::test]
2744 async fn test_excerpts_removed(cx: &mut gpui::TestAppContext) {
2745 init_test(cx, |settings| {
2746 settings.defaults.inlay_hints = Some(InlayHintSettings {
2747 enabled: true,
2748 show_type_hints: false,
2749 show_parameter_hints: false,
2750 show_other_hints: false,
2751 })
2752 });
2753
2754 let mut language = Language::new(
2755 LanguageConfig {
2756 name: "Rust".into(),
2757 path_suffixes: vec!["rs".to_string()],
2758 ..Default::default()
2759 },
2760 Some(tree_sitter_rust::language()),
2761 );
2762 let mut fake_servers = language
2763 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
2764 capabilities: lsp::ServerCapabilities {
2765 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
2766 ..Default::default()
2767 },
2768 ..Default::default()
2769 }))
2770 .await;
2771 let language = Arc::new(language);
2772 let fs = FakeFs::new(cx.background_executor.clone());
2773 fs.insert_tree(
2774 "/a",
2775 json!({
2776 "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
2777 "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::<Vec<_>>().join("")),
2778 }),
2779 )
2780 .await;
2781 let project = Project::test(fs, ["/a".as_ref()], cx).await;
2782 project.update(cx, |project, _| {
2783 project.languages().add(Arc::clone(&language))
2784 });
2785 let worktree_id = project.update(cx, |project, cx| {
2786 project.worktrees().next().unwrap().read(cx).id()
2787 });
2788
2789 let buffer_1 = project
2790 .update(cx, |project, cx| {
2791 project.open_buffer((worktree_id, "main.rs"), cx)
2792 })
2793 .await
2794 .unwrap();
2795 let buffer_2 = project
2796 .update(cx, |project, cx| {
2797 project.open_buffer((worktree_id, "other.rs"), cx)
2798 })
2799 .await
2800 .unwrap();
2801 let multibuffer = cx.build_model(|_| MultiBuffer::new(0));
2802 let (buffer_1_excerpts, buffer_2_excerpts) = multibuffer.update(cx, |multibuffer, cx| {
2803 let buffer_1_excerpts = multibuffer.push_excerpts(
2804 buffer_1.clone(),
2805 [ExcerptRange {
2806 context: Point::new(0, 0)..Point::new(2, 0),
2807 primary: None,
2808 }],
2809 cx,
2810 );
2811 let buffer_2_excerpts = multibuffer.push_excerpts(
2812 buffer_2.clone(),
2813 [ExcerptRange {
2814 context: Point::new(0, 1)..Point::new(2, 1),
2815 primary: None,
2816 }],
2817 cx,
2818 );
2819 (buffer_1_excerpts, buffer_2_excerpts)
2820 });
2821
2822 assert!(!buffer_1_excerpts.is_empty());
2823 assert!(!buffer_2_excerpts.is_empty());
2824
2825 cx.executor().run_until_parked();
2826 let editor =
2827 cx.add_window(|cx| Editor::for_multibuffer(multibuffer, Some(project.clone()), cx));
2828 let editor_edited = Arc::new(AtomicBool::new(false));
2829 let fake_server = fake_servers.next().await.unwrap();
2830 let closure_editor_edited = Arc::clone(&editor_edited);
2831 fake_server
2832 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
2833 let task_editor_edited = Arc::clone(&closure_editor_edited);
2834 async move {
2835 let hint_text = if params.text_document.uri
2836 == lsp::Url::from_file_path("/a/main.rs").unwrap()
2837 {
2838 "main hint"
2839 } else if params.text_document.uri
2840 == lsp::Url::from_file_path("/a/other.rs").unwrap()
2841 {
2842 "other hint"
2843 } else {
2844 panic!("unexpected uri: {:?}", params.text_document.uri);
2845 };
2846
2847 let positions = [
2848 lsp::Position::new(0, 2),
2849 lsp::Position::new(4, 2),
2850 lsp::Position::new(22, 2),
2851 lsp::Position::new(44, 2),
2852 lsp::Position::new(56, 2),
2853 lsp::Position::new(67, 2),
2854 ];
2855 let out_of_range_hint = lsp::InlayHint {
2856 position: lsp::Position::new(
2857 params.range.start.line + 99,
2858 params.range.start.character + 99,
2859 ),
2860 label: lsp::InlayHintLabel::String(
2861 "out of excerpt range, should be ignored".to_string(),
2862 ),
2863 kind: None,
2864 text_edits: None,
2865 tooltip: None,
2866 padding_left: None,
2867 padding_right: None,
2868 data: None,
2869 };
2870
2871 let edited = task_editor_edited.load(Ordering::Acquire);
2872 Ok(Some(
2873 std::iter::once(out_of_range_hint)
2874 .chain(positions.into_iter().enumerate().map(|(i, position)| {
2875 lsp::InlayHint {
2876 position,
2877 label: lsp::InlayHintLabel::String(format!(
2878 "{hint_text}{} #{i}",
2879 if edited { "(edited)" } else { "" },
2880 )),
2881 kind: None,
2882 text_edits: None,
2883 tooltip: None,
2884 padding_left: None,
2885 padding_right: None,
2886 data: None,
2887 }
2888 }))
2889 .collect(),
2890 ))
2891 }
2892 })
2893 .next()
2894 .await;
2895 cx.executor().run_until_parked();
2896
2897 editor.update(cx, |editor, cx| {
2898 assert_eq!(
2899 vec!["main hint #0".to_string(), "other hint #0".to_string()],
2900 cached_hint_labels(editor),
2901 "Cache should update for both excerpts despite hints display was disabled"
2902 );
2903 assert!(
2904 visible_hint_labels(editor, cx).is_empty(),
2905 "All hints are disabled and should not be shown despite being present in the cache"
2906 );
2907 assert_eq!(
2908 editor.inlay_hint_cache().version,
2909 2,
2910 "Cache should update once per excerpt query"
2911 );
2912 });
2913
2914 editor.update(cx, |editor, cx| {
2915 editor.buffer().update(cx, |multibuffer, cx| {
2916 multibuffer.remove_excerpts(buffer_2_excerpts, cx)
2917 })
2918 });
2919 cx.executor().run_until_parked();
2920 editor.update(cx, |editor, cx| {
2921 assert_eq!(
2922 vec!["main hint #0".to_string()],
2923 cached_hint_labels(editor),
2924 "For the removed excerpt, should clean corresponding cached hints"
2925 );
2926 assert!(
2927 visible_hint_labels(editor, cx).is_empty(),
2928 "All hints are disabled and should not be shown despite being present in the cache"
2929 );
2930 assert_eq!(
2931 editor.inlay_hint_cache().version,
2932 3,
2933 "Excerpt removal should trigger a cache update"
2934 );
2935 });
2936
2937 update_test_language_settings(cx, |settings| {
2938 settings.defaults.inlay_hints = Some(InlayHintSettings {
2939 enabled: true,
2940 show_type_hints: true,
2941 show_parameter_hints: true,
2942 show_other_hints: true,
2943 })
2944 });
2945 cx.executor().run_until_parked();
2946 editor.update(cx, |editor, cx| {
2947 let expected_hints = vec!["main hint #0".to_string()];
2948 assert_eq!(
2949 expected_hints,
2950 cached_hint_labels(editor),
2951 "Hint display settings change should not change the cache"
2952 );
2953 assert_eq!(
2954 expected_hints,
2955 visible_hint_labels(editor, cx),
2956 "Settings change should make cached hints visible"
2957 );
2958 assert_eq!(
2959 editor.inlay_hint_cache().version,
2960 4,
2961 "Settings change should trigger a cache update"
2962 );
2963 });
2964 }
2965
2966 #[gpui::test]
2967 async fn test_inside_char_boundary_range_hints(cx: &mut gpui::TestAppContext) {
2968 init_test(cx, |settings| {
2969 settings.defaults.inlay_hints = Some(InlayHintSettings {
2970 enabled: true,
2971 show_type_hints: true,
2972 show_parameter_hints: true,
2973 show_other_hints: true,
2974 })
2975 });
2976
2977 let mut language = Language::new(
2978 LanguageConfig {
2979 name: "Rust".into(),
2980 path_suffixes: vec!["rs".to_string()],
2981 ..Default::default()
2982 },
2983 Some(tree_sitter_rust::language()),
2984 );
2985 let mut fake_servers = language
2986 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
2987 capabilities: lsp::ServerCapabilities {
2988 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
2989 ..Default::default()
2990 },
2991 ..Default::default()
2992 }))
2993 .await;
2994 let fs = FakeFs::new(cx.background_executor.clone());
2995 fs.insert_tree(
2996 "/a",
2997 json!({
2998 "main.rs": format!(r#"fn main() {{\n{}\n}}"#, format!("let i = {};\n", "√".repeat(10)).repeat(500)),
2999 "other.rs": "// Test file",
3000 }),
3001 )
3002 .await;
3003 let project = Project::test(fs, ["/a".as_ref()], cx).await;
3004 project.update(cx, |project, _| project.languages().add(Arc::new(language)));
3005 let buffer = project
3006 .update(cx, |project, cx| {
3007 project.open_local_buffer("/a/main.rs", cx)
3008 })
3009 .await
3010 .unwrap();
3011 cx.executor().run_until_parked();
3012 cx.executor().start_waiting();
3013 let fake_server = fake_servers.next().await.unwrap();
3014 let editor = cx.add_window(|cx| Editor::for_buffer(buffer, Some(project), cx));
3015 let lsp_request_count = Arc::new(AtomicU32::new(0));
3016 let closure_lsp_request_count = Arc::clone(&lsp_request_count);
3017 fake_server
3018 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
3019 let task_lsp_request_count = Arc::clone(&closure_lsp_request_count);
3020 async move {
3021 assert_eq!(
3022 params.text_document.uri,
3023 lsp::Url::from_file_path("/a/main.rs").unwrap(),
3024 );
3025 let query_start = params.range.start;
3026 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::Release) + 1;
3027 Ok(Some(vec![lsp::InlayHint {
3028 position: query_start,
3029 label: lsp::InlayHintLabel::String(i.to_string()),
3030 kind: None,
3031 text_edits: None,
3032 tooltip: None,
3033 padding_left: None,
3034 padding_right: None,
3035 data: None,
3036 }]))
3037 }
3038 })
3039 .next()
3040 .await;
3041
3042 cx.executor().run_until_parked();
3043 editor.update(cx, |editor, cx| {
3044 editor.change_selections(None, cx, |s| {
3045 s.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
3046 })
3047 });
3048 cx.executor().run_until_parked();
3049 editor.update(cx, |editor, cx| {
3050 let expected_hints = vec!["1".to_string()];
3051 assert_eq!(expected_hints, cached_hint_labels(editor));
3052 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
3053 assert_eq!(editor.inlay_hint_cache().version, 1);
3054 });
3055 }
3056
3057 #[gpui::test]
3058 async fn test_toggle_inlay_hints(cx: &mut gpui::TestAppContext) {
3059 init_test(cx, |settings| {
3060 settings.defaults.inlay_hints = Some(InlayHintSettings {
3061 enabled: false,
3062 show_type_hints: true,
3063 show_parameter_hints: true,
3064 show_other_hints: true,
3065 })
3066 });
3067
3068 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
3069
3070 editor.update(cx, |editor, cx| {
3071 editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
3072 });
3073 cx.executor().start_waiting();
3074 let lsp_request_count = Arc::new(AtomicU32::new(0));
3075 let closure_lsp_request_count = Arc::clone(&lsp_request_count);
3076 fake_server
3077 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
3078 let task_lsp_request_count = Arc::clone(&closure_lsp_request_count);
3079 async move {
3080 assert_eq!(
3081 params.text_document.uri,
3082 lsp::Url::from_file_path(file_with_hints).unwrap(),
3083 );
3084
3085 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
3086 Ok(Some(vec![lsp::InlayHint {
3087 position: lsp::Position::new(0, i),
3088 label: lsp::InlayHintLabel::String(i.to_string()),
3089 kind: None,
3090 text_edits: None,
3091 tooltip: None,
3092 padding_left: None,
3093 padding_right: None,
3094 data: None,
3095 }]))
3096 }
3097 })
3098 .next()
3099 .await;
3100 cx.executor().run_until_parked();
3101 editor.update(cx, |editor, cx| {
3102 let expected_hints = vec!["1".to_string()];
3103 assert_eq!(
3104 expected_hints,
3105 cached_hint_labels(editor),
3106 "Should display inlays after toggle despite them disabled in settings"
3107 );
3108 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
3109 assert_eq!(
3110 editor.inlay_hint_cache().version,
3111 1,
3112 "First toggle should be cache's first update"
3113 );
3114 });
3115
3116 editor.update(cx, |editor, cx| {
3117 editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
3118 });
3119 cx.executor().run_until_parked();
3120 editor.update(cx, |editor, cx| {
3121 assert!(
3122 cached_hint_labels(editor).is_empty(),
3123 "Should clear hints after 2nd toggle"
3124 );
3125 assert!(visible_hint_labels(editor, cx).is_empty());
3126 assert_eq!(editor.inlay_hint_cache().version, 2);
3127 });
3128
3129 update_test_language_settings(cx, |settings| {
3130 settings.defaults.inlay_hints = Some(InlayHintSettings {
3131 enabled: true,
3132 show_type_hints: true,
3133 show_parameter_hints: true,
3134 show_other_hints: true,
3135 })
3136 });
3137 cx.executor().run_until_parked();
3138 editor.update(cx, |editor, cx| {
3139 let expected_hints = vec!["2".to_string()];
3140 assert_eq!(
3141 expected_hints,
3142 cached_hint_labels(editor),
3143 "Should query LSP hints for the 2nd time after enabling hints in settings"
3144 );
3145 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
3146 assert_eq!(editor.inlay_hint_cache().version, 3);
3147 });
3148
3149 editor.update(cx, |editor, cx| {
3150 editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
3151 });
3152 cx.executor().run_until_parked();
3153 editor.update(cx, |editor, cx| {
3154 assert!(
3155 cached_hint_labels(editor).is_empty(),
3156 "Should clear hints after enabling in settings and a 3rd toggle"
3157 );
3158 assert!(visible_hint_labels(editor, cx).is_empty());
3159 assert_eq!(editor.inlay_hint_cache().version, 4);
3160 });
3161
3162 editor.update(cx, |editor, cx| {
3163 editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
3164 });
3165 cx.executor().run_until_parked();
3166 editor.update(cx, |editor, cx| {
3167 let expected_hints = vec!["3".to_string()];
3168 assert_eq!(
3169 expected_hints,
3170 cached_hint_labels(editor),
3171 "Should query LSP hints for the 3rd time after enabling hints in settings and toggling them back on"
3172 );
3173 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
3174 assert_eq!(editor.inlay_hint_cache().version, 5);
3175 });
3176 }
3177
3178 pub(crate) fn init_test(cx: &mut TestAppContext, f: impl Fn(&mut AllLanguageSettingsContent)) {
3179 cx.update(|cx| {
3180 let settings_store = SettingsStore::test(cx);
3181 cx.set_global(settings_store);
3182 theme::init(theme::LoadThemes::JustBase, cx);
3183 client::init_settings(cx);
3184 language::init(cx);
3185 Project::init_settings(cx);
3186 workspace::init_settings(cx);
3187 crate::init(cx);
3188 });
3189
3190 update_test_language_settings(cx, f);
3191 }
3192
3193 async fn prepare_test_objects(
3194 cx: &mut TestAppContext,
3195 ) -> (&'static str, WindowHandle<Editor>, FakeLanguageServer) {
3196 let mut language = Language::new(
3197 LanguageConfig {
3198 name: "Rust".into(),
3199 path_suffixes: vec!["rs".to_string()],
3200 ..Default::default()
3201 },
3202 Some(tree_sitter_rust::language()),
3203 );
3204 let mut fake_servers = language
3205 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
3206 capabilities: lsp::ServerCapabilities {
3207 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
3208 ..Default::default()
3209 },
3210 ..Default::default()
3211 }))
3212 .await;
3213
3214 let fs = FakeFs::new(cx.background_executor.clone());
3215 fs.insert_tree(
3216 "/a",
3217 json!({
3218 "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
3219 "other.rs": "// Test file",
3220 }),
3221 )
3222 .await;
3223
3224 let project = Project::test(fs, ["/a".as_ref()], cx).await;
3225 project.update(cx, |project, _| project.languages().add(Arc::new(language)));
3226 let buffer = project
3227 .update(cx, |project, cx| {
3228 project.open_local_buffer("/a/main.rs", cx)
3229 })
3230 .await
3231 .unwrap();
3232 cx.executor().run_until_parked();
3233 cx.executor().start_waiting();
3234 let fake_server = fake_servers.next().await.unwrap();
3235 let editor = cx.add_window(|cx| Editor::for_buffer(buffer, Some(project), cx));
3236
3237 editor.update(cx, |editor, cx| {
3238 assert!(cached_hint_labels(editor).is_empty());
3239 assert!(visible_hint_labels(editor, cx).is_empty());
3240 assert_eq!(editor.inlay_hint_cache().version, 0);
3241 });
3242
3243 ("/a/main.rs", editor, fake_server)
3244 }
3245
3246 pub fn cached_hint_labels(editor: &Editor) -> Vec<String> {
3247 let mut labels = Vec::new();
3248 for (_, excerpt_hints) in &editor.inlay_hint_cache().hints {
3249 let excerpt_hints = excerpt_hints.read();
3250 for id in &excerpt_hints.ordered_hints {
3251 labels.push(excerpt_hints.hints_by_id[id].text());
3252 }
3253 }
3254
3255 labels.sort();
3256 labels
3257 }
3258
3259 pub fn visible_hint_labels(editor: &Editor, cx: &ViewContext<'_, Editor>) -> Vec<String> {
3260 let mut hints = editor
3261 .visible_inlay_hints(cx)
3262 .into_iter()
3263 .map(|hint| hint.text.to_string())
3264 .collect::<Vec<_>>();
3265 hints.sort();
3266 hints
3267 }
3268}