Merge remote-tracking branch 'origin/main' into inlay-hint-tooltip

This reverts commit 0bb1a5f98a.

crates/editor/src/hover_links.rs

@@ -1,6 +1,7 @@
 use crate::{
     Anchor, Editor, EditorSettings, EditorSnapshot, FindAllReferences, GoToDefinition,
     GoToTypeDefinition, GotoDefinitionKind, InlayId, Navigated, PointForPosition, SelectPhase,
+    display_map::InlayOffset,
     editor_settings::GoToDefinitionFallback,
     hover_popover::{self, InlayHover},
     scroll::ScrollAmount,
@@ -15,6 +16,7 @@ use project::{
 };
 use settings::Settings;
 use std::ops::Range;
+use text;
 use theme::ActiveTheme as _;
 use util::{ResultExt, TryFutureExt as _, maybe};
 
@@ -121,13 +123,14 @@ impl Editor {
         cx: &mut Context<Self>,
     ) {
         let hovered_link_modifier = Editor::multi_cursor_modifier(false, &modifiers, cx);
-        if !hovered_link_modifier || self.has_pending_selection() {
-            self.hide_hovered_link(cx);
-            return;
-        }
 
         match point_for_position.as_valid() {
             Some(point) => {
+                if !hovered_link_modifier || self.has_pending_selection() {
+                    self.hide_hovered_link(cx);
+                    return;
+                }
+
                 let trigger_point = TriggerPoint::Text(
                     snapshot
                         .buffer_snapshot
@@ -284,114 +287,117 @@ pub fn update_inlay_link_and_hover_points(
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) {
-    let hovered_offset = if point_for_position.column_overshoot_after_line_end == 0 {
+    // For inlay hints, we need to use the exact position where the mouse is
-        Some(snapshot.display_point_to_inlay_offset(point_for_position.exact_unclipped, Bias::Left))
+    // But we must clip it to valid bounds to avoid panics
-    } else {
+    let clipped_point = snapshot.clip_point(point_for_position.exact_unclipped, Bias::Left);
-        None
+    let hovered_offset = snapshot.display_point_to_inlay_offset(clipped_point, Bias::Left);
-    };
+
     let mut go_to_definition_updated = false;
     let mut hover_updated = false;
-    if let Some(hovered_offset) = hovered_offset {
+
-        let buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
+    // Get all visible inlay hints
-        let previous_valid_anchor = buffer_snapshot.anchor_at(
+    let visible_hints = editor.visible_inlay_hints(cx);
-            point_for_position.previous_valid.to_point(snapshot),
+
-            Bias::Left,
+    // Find if we're hovering over an inlay hint
-        );
+    if let Some(hovered_inlay) = visible_hints.into_iter().find(|inlay| {
-        let next_valid_anchor = buffer_snapshot.anchor_at(
+        // Only process hint inlays
-            point_for_position.next_valid.to_point(snapshot),
+        if !matches!(inlay.id, InlayId::Hint(_)) {
-            Bias::Right,
+            return false;
-        );
+        }
-        if let Some(hovered_hint) = editor
+
-            .visible_inlay_hints(cx)
+        // Check if the hovered position falls within this inlay's display range
-            .into_iter()
+        let inlay_start = snapshot.anchor_to_inlay_offset(inlay.position);
-            .skip_while(|hint| {
+        let inlay_end = InlayOffset(inlay_start.0 + inlay.text.len());
-                hint.position
+
-                    .cmp(&previous_valid_anchor, &buffer_snapshot)
+        hovered_offset >= inlay_start && hovered_offset < inlay_end
-                    .is_lt()
+    }) {
-            })
+        let inlay_hint_cache = editor.inlay_hint_cache();
-            .take_while(|hint| {
+        let excerpt_id = hovered_inlay.position.excerpt_id;
-                hint.position
+
-                    .cmp(&next_valid_anchor, &buffer_snapshot)
+        // Extract the hint ID from the inlay
-                    .is_le()
+        if let InlayId::Hint(_hint_id) = hovered_inlay.id {
-            })
+            if let Some(cached_hint) = inlay_hint_cache.hint_by_id(excerpt_id, hovered_inlay.id) {
-            .max_by_key(|hint| hint.id)
+                // Check if we should process this hint for hover
-        {
+                let should_process_hint = match cached_hint.resolve_state {
-            let inlay_hint_cache = editor.inlay_hint_cache();
-            let excerpt_id = previous_valid_anchor.excerpt_id;
-            if let Some(cached_hint) = inlay_hint_cache.hint_by_id(excerpt_id, hovered_hint.id) {
-                match cached_hint.resolve_state {
                     ResolveState::CanResolve(_, _) => {
-                        if let Some(buffer_id) = previous_valid_anchor.buffer_id {
+                        // For unresolved hints, spawn resolution
+                        if let Some(buffer_id) = hovered_inlay.position.buffer_id {
                             inlay_hint_cache.spawn_hint_resolve(
                                 buffer_id,
                                 excerpt_id,
-                                hovered_hint.id,
+                                hovered_inlay.id,
                                 window,
                                 cx,
                             );
                         }
+                        false // Don't process unresolved hints
                     }
-                    ResolveState::Resolved => {
+                    ResolveState::Resolved => true,
-                        let mut extra_shift_left = 0;
+                    ResolveState::Resolving => false,
-                        let mut extra_shift_right = 0;
+                };
-                        if cached_hint.padding_left {
+
-                            extra_shift_left += 1;
+                if should_process_hint {
-                            extra_shift_right += 1;
+                    let mut extra_shift_left = 0;
-                        }
+                    let mut extra_shift_right = 0;
-                        if cached_hint.padding_right {
+                    if cached_hint.padding_left {
-                            extra_shift_right += 1;
+                        extra_shift_left += 1;
-                        }
+                        extra_shift_right += 1;
-                        match cached_hint.label {
+                    }
-                            project::InlayHintLabel::String(_) => {
+                    if cached_hint.padding_right {
-                                if let Some(tooltip) = cached_hint.tooltip {
+                        extra_shift_right += 1;
-                                    hover_popover::hover_at_inlay(
+                    }
-                                        editor,
+                    match cached_hint.label {
-                                        InlayHover {
+                        project::InlayHintLabel::String(_) => {
-                                            tooltip: match tooltip {
+                            if let Some(tooltip) = cached_hint.tooltip {
-                                                InlayHintTooltip::String(text) => HoverBlock {
+                                hover_popover::hover_at_inlay(
-                                                    text,
+                                    editor,
-                                                    kind: HoverBlockKind::PlainText,
+                                    InlayHover {
-                                                },
+                                        tooltip: match tooltip {
-                                                InlayHintTooltip::MarkupContent(content) => {
+                                            InlayHintTooltip::String(text) => HoverBlock {
-                                                    HoverBlock {
+                                                text,
-                                                        text: content.value,
+                                                kind: HoverBlockKind::PlainText,
-                                                        kind: content.kind,
+                                            },
-                                                    }
+                                            InlayHintTooltip::MarkupContent(content) => {
+                                                HoverBlock {
+                                                    text: content.value,
+                                                    kind: content.kind,
                                                 }
-                                            },
+                                            }
-                                            range: InlayHighlight {
-                                                inlay: hovered_hint.id,
-                                                inlay_position: hovered_hint.position,
-                                                range: extra_shift_left
-                                                    ..hovered_hint.text.len() + extra_shift_right,
-                                            },
                                         },
-                                        window,
+                                        range: InlayHighlight {
-                                        cx,
+                                            inlay: hovered_inlay.id,
-                                    );
+                                            inlay_position: hovered_inlay.position,
-                                    hover_updated = true;
+                                            range: extra_shift_left
-                                }
+                                                ..hovered_inlay.text.len() + extra_shift_right,
+                                        },
+                                    },
+                                    window,
+                                    cx,
+                                );
+                                hover_updated = true;
                             }
-                            project::InlayHintLabel::LabelParts(label_parts) => {
+                        }
-                                let hint_start =
+                        project::InlayHintLabel::LabelParts(label_parts) => {
-                                    snapshot.anchor_to_inlay_offset(hovered_hint.position);
+                            // Find the first part with actual hover information (tooltip or location)
-                                if let Some((hovered_hint_part, part_range)) =
+                            let _hint_start =
-                                    hover_popover::find_hovered_hint_part(
+                                snapshot.anchor_to_inlay_offset(hovered_inlay.position);
-                                        label_parts,
+                            let mut part_offset = 0;
-                                        hint_start,
+
-                                        hovered_offset,
+                            for part in label_parts {
-                                    )
+                                let part_len = part.value.chars().count();
-                                {
+
-                                    let highlight_start =
+                                if part.tooltip.is_some() || part.location.is_some() {
-                                        (part_range.start - hint_start).0 + extra_shift_left;
+                                    // Found the meaningful part - show hover for it
-                                    let highlight_end =
+                                    let highlight_start = part_offset + extra_shift_left;
-                                        (part_range.end - hint_start).0 + extra_shift_right;
+                                    let highlight_end = part_offset + part_len + extra_shift_right;
+
                                     let highlight = InlayHighlight {
-                                        inlay: hovered_hint.id,
+                                        inlay: hovered_inlay.id,
-                                        inlay_position: hovered_hint.position,
+                                        inlay_position: hovered_inlay.position,
                                         range: highlight_start..highlight_end,
                                     };
-                                    if let Some(tooltip) = hovered_hint_part.tooltip {
+
+                                    if let Some(tooltip) = part.tooltip {
                                         hover_popover::hover_at_inlay(
                                             editor,
                                             InlayHover {
@@ -415,10 +421,160 @@ pub fn update_inlay_link_and_hover_points(
                                             cx,
                                         );
                                         hover_updated = true;
-                                    }
+                                    } else if let Some((_language_server_id, location)) =
-                                    if let Some((language_server_id, location)) =
+                                        part.location.clone()
-                                        hovered_hint_part.location
                                     {
+                                        // When there's no tooltip but we have a location, perform a "Go to Definition" style operation
+                                        let filename = location
+                                            .uri
+                                            .path()
+                                            .split('/')
+                                            .next_back()
+                                            .unwrap_or("unknown")
+                                            .to_string();
+
+                                        hover_popover::hover_at_inlay(
+                                            editor,
+                                            InlayHover {
+                                                tooltip: HoverBlock {
+                                                    text: "Loading documentation...".to_string(),
+                                                    kind: HoverBlockKind::PlainText,
+                                                },
+                                                range: highlight.clone(),
+                                            },
+                                            window,
+                                            cx,
+                                        );
+                                        hover_updated = true;
+
+                                        // Now perform the "Go to Definition" flow to get hover documentation
+                                        if let Some(project) = editor.project.clone() {
+                                            let highlight = highlight.clone();
+                                            let hint_value = part.value.clone();
+                                            let location_uri = location.uri.clone();
+
+                                            cx.spawn_in(window, async move |editor, cx| {
+                                                async move {
+                                                    // Small delay to show the loading message first
+                                                    cx.background_executor()
+                                                        .timer(std::time::Duration::from_millis(50))
+                                                        .await;
+
+                                                    // Convert LSP URL to file path
+                                                    let file_path = location.uri.to_file_path()
+                                                        .map_err(|_| anyhow::anyhow!("Invalid file URL"))?;
+
+                                                    // Open the definition file
+                                                    let definition_buffer = project
+                                                        .update(cx, |project, cx| {
+                                                            project.open_local_buffer(file_path, cx)
+                                                        })?
+                                                        .await?;
+
+                                                    // Extract documentation directly from the source
+                                                    let documentation = definition_buffer.update(cx, |buffer, _| {
+                                                        let line_number = location.range.start.line as usize;
+
+                                                        // Get the text of the buffer
+                                                        let text = buffer.text();
+                                                        let lines: Vec<&str> = text.lines().collect();
+
+                                                        // Look backwards from the definition line to find doc comments
+                                                        let mut doc_lines = Vec::new();
+                                                        let mut current_line = line_number.saturating_sub(1);
+
+                                                        // Skip any attributes like #[derive(...)]
+                                                        while current_line > 0 && lines.get(current_line).map_or(false, |line| {
+                                                            let trimmed = line.trim();
+                                                            trimmed.starts_with("#[") || trimmed.is_empty()
+                                                        }) {
+                                                            current_line = current_line.saturating_sub(1);
+                                                        }
+
+                                                        // Collect doc comments
+                                                        while current_line > 0 {
+                                                            if let Some(line) = lines.get(current_line) {
+                                                                let trimmed = line.trim();
+                                                                if trimmed.starts_with("///") {
+                                                                    // Remove the /// and any leading space
+                                                                    let doc_text = trimmed.strip_prefix("///").unwrap_or("")
+                                                                        .strip_prefix(" ").unwrap_or_else(|| trimmed.strip_prefix("///").unwrap_or(""));
+                                                                    doc_lines.push(doc_text.to_string());
+                                                                } else if !trimmed.is_empty() {
+                                                                    // Stop at the first non-doc, non-empty line
+                                                                    break;
+                                                                }
+                                                            }
+                                                            current_line = current_line.saturating_sub(1);
+                                                        }
+
+                                                        // Reverse to get correct order
+                                                        doc_lines.reverse();
+
+                                                        // Also get the actual definition line
+                                                        let definition = lines.get(line_number)
+                                                            .map(|s| s.trim().to_string())
+                                                            .unwrap_or_else(|| hint_value.clone());
+
+                                                        if doc_lines.is_empty() {
+                                                            None
+                                                        } else {
+                                                            let docs = doc_lines.join("\n");
+                                                            Some((definition, docs))
+                                                        }
+                                                    })?;
+
+                                                    if let Some((definition, docs)) = documentation {
+                                                        // Format as markdown with the definition as a code block
+                                                        let formatted_docs = format!("```rust\n{}\n```\n\n{}", definition, docs);
+
+                                                        editor.update_in(cx, |editor, window, cx| {
+                                                            hover_popover::hover_at_inlay(
+                                                                editor,
+                                                                InlayHover {
+                                                                    tooltip: HoverBlock {
+                                                                        text: formatted_docs,
+                                                                        kind: HoverBlockKind::Markdown,
+                                                                    },
+                                                                    range: highlight,
+                                                                },
+                                                                window,
+                                                                cx,
+                                                            );
+                                                        }).log_err();
+                                                    } else {
+                                                        // Fallback to showing just the location info
+                                                        let fallback_text = format!(
+                                                            "{}\n\nDefined in {} at line {}",
+                                                            hint_value.trim(),
+                                                            filename,
+                                                            location.range.start.line + 1
+                                                        );
+                                                        editor.update_in(cx, |editor, window, cx| {
+                                                            hover_popover::hover_at_inlay(
+                                                                editor,
+                                                                InlayHover {
+                                                                    tooltip: HoverBlock {
+                                                                        text: fallback_text,
+                                                                        kind: HoverBlockKind::PlainText,
+                                                                    },
+                                                                    range: highlight,
+                                                                },
+                                                                window,
+                                                                cx,
+                                                            );
+                                                        }).log_err();
+                                                    }
+
+                                                    anyhow::Ok(())
+                                                }
+                                                .log_err()
+                                                .await
+                                            }).detach();
+                                        }
+                                    }
+
+                                    if let Some((language_server_id, location)) = &part.location {
                                         if secondary_held
                                             && !editor.has_pending_nonempty_selection()
                                         {
@@ -428,8 +584,8 @@ pub fn update_inlay_link_and_hover_points(
                                                 editor,
                                                 TriggerPoint::InlayHint(
                                                     highlight,
-                                                    location,
+                                                    location.clone(),
-                                                    language_server_id,
+                                                    *language_server_id,
                                                 ),
                                                 snapshot,
                                                 window,
@@ -437,11 +593,14 @@ pub fn update_inlay_link_and_hover_points(
                                             );
                                         }
                                     }
+
+                                    break;
                                 }
+
+                                part_offset += part_len;
                             }
-                        };
+                        }
-                    }
+                    };
-                    ResolveState::Resolving => {}
                 }
             }
         }