more, keep for now

Author: asukaminato0721

pyrefly/lib/lsp/module_helpers.rs

@@ -17,6 +17,7 @@ use tracing::warn;
 use crate::module::bundled::BundledStub;
 use crate::module::typeshed::typeshed;
 use crate::module::typeshed_third_party::typeshed_third_party;
+use crate::types::stdlib::Stdlib;
 
 /// Convert to a path we can show to the user. The contents may not match the disk, but it has
 /// to be basically right.
@@ -50,9 +51,38 @@ pub fn to_real_path(path: &ModulePath) -> Option<PathBuf> {
     }
 }
 
+#[allow(dead_code)]
 pub fn collect_symbol_def_paths(t: &Type) -> Vec<(QName, PathBuf)> {
+    collect_symbol_def_paths_with_tuple_qname(t, None)
+}
+
+pub fn collect_symbol_def_paths_with_stdlib(t: &Type, stdlib: &Stdlib) -> Vec<(QName, PathBuf)> {
+    collect_symbol_def_paths_with_tuple_qname(t, Some(stdlib.tuple_object().qname().clone()))
+}
+
+fn collect_symbol_def_paths_with_tuple_qname(
+    t: &Type,
+    tuple_qname: Option<QName>,
+) -> Vec<(QName, PathBuf)> {
     let mut tracked_def_locs = SmallSet::new();
-    t.universe(&mut |t| tracked_def_locs.extend(t.qname()));
+    t.universe(&mut |t| {
+        if let Some(qname) = t.qname() {
+            tracked_def_locs.insert(qname.clone());
+        }
+    });
+
+    if let Some(tuple_qname) = tuple_qname {
+        let mut has_tuple = false;
+        t.universe(&mut |ty| {
+            if matches!(ty, Type::Tuple(_)) {
+                has_tuple = true;
+            }
+        });
+        if has_tuple {
+            tracked_def_locs.insert(tuple_qname);
+        }
+    }
+
     tracked_def_locs
         .into_iter()
         .map(|qname| {
@@ -64,7 +94,7 @@ pub fn collect_symbol_def_paths(t: &Type) -> Vec<(QName, PathBuf)> {
                 }
                 _ => module_path.as_path().to_path_buf(),
             };
-            (qname.clone(), file_path)
+            (qname, file_path)
         })
         .collect()
 }

pyrefly/lib/lsp/wasm/hover.rs

@@ -6,6 +6,7 @@
  */
 
 use std::collections::HashMap;
+use std::path::PathBuf;
 
 use lsp_types::Hover;
 use lsp_types::HoverContents;
@@ -18,6 +19,7 @@ use pyrefly_python::docstring::parse_parameter_documentation;
 use pyrefly_python::ignore::Ignore;
 use pyrefly_python::ignore::Tool;
 use pyrefly_python::ignore::find_comment_start_in_line;
+use pyrefly_python::qname::QName;
 use pyrefly_python::symbol_kind::SymbolKind;
 use pyrefly_types::callable::Callable;
 use pyrefly_types::callable::Param;
@@ -32,7 +34,7 @@ use ruff_text_size::TextSize;
 
 use crate::alt::answers_solver::AnswersSolver;
 use crate::error::error::Error;
-use crate::lsp::module_helpers::collect_symbol_def_paths;
+use crate::lsp::module_helpers::collect_symbol_def_paths_with_stdlib;
 use crate::state::lsp::DefinitionMetadata;
 use crate::state::lsp::FindDefinitionItemWithDocstring;
 use crate::state::lsp::FindPreference;
@@ -113,12 +115,12 @@ pub struct HoverValue {
     pub parameter_doc: Option<(String, String)>,
     pub display: Option<String>,
     pub show_go_to_links: bool,
+    pub symbol_def_paths: Vec<(QName, PathBuf)>,
 }
 
 impl HoverValue {
     #[cfg(not(target_arch = "wasm32"))]
-    fn format_symbol_def_locations(t: &Type) -> Option<String> {
-        let symbol_paths = collect_symbol_def_paths(t);
+    fn format_symbol_def_locations(symbol_paths: &[(QName, PathBuf)]) -> Option<String> {
         let linked_names = symbol_paths
             .into_iter()
             .filter_map(|(qname, file_path)| {
@@ -154,7 +156,7 @@ impl HoverValue {
     }
 
     #[cfg(target_arch = "wasm32")]
-    fn format_symbol_def_locations(t: &Type) -> Option<String> {
+    fn format_symbol_def_locations(_symbol_paths: &[(QName, PathBuf)]) -> Option<String> {
         None
     }
 
@@ -187,7 +189,7 @@ impl HoverValue {
             .as_ref()
             .map_or("".to_owned(), |s| format!("{s}: "));
         let symbol_def_formatted = if self.show_go_to_links {
-            HoverValue::format_symbol_def_locations(&self.type_).unwrap_or("".to_owned())
+            HoverValue::format_symbol_def_locations(&self.symbol_def_paths).unwrap_or("".to_owned())
         } else {
             String::new()
         };
@@ -365,6 +367,9 @@ pub fn get_hover(
         }
     }
 
+    let stdlib = transaction.get_stdlib(handle);
+    let symbol_def_paths = collect_symbol_def_paths_with_stdlib(&type_, stdlib.as_ref());
+
     Some(
         HoverValue {
             kind,
@@ -374,6 +379,7 @@ pub fn get_hover(
             parameter_doc,
             display: type_display,
             show_go_to_links,
+            symbol_def_paths,
         }
         .format(),
     )

pyrefly/lib/state/lsp.rs

@@ -67,7 +67,7 @@ use crate::binding::binding::Key;
 use crate::config::error_kind::ErrorKind;
 use crate::export::exports::Export;
 use crate::export::exports::ExportLocation;
-use crate::lsp::module_helpers::collect_symbol_def_paths;
+use crate::lsp::module_helpers::collect_symbol_def_paths_with_stdlib;
 use crate::state::ide::IntermediateDefinition;
 use crate::state::ide::import_regular_import_edit;
 use crate::state::ide::insert_import_edit;
@@ -1565,7 +1565,8 @@ impl<'a> Transaction<'a> {
         let type_ = self.get_type_at(handle, position);
 
         if let Some(t) = type_ {
-            let symbol_def_paths = collect_symbol_def_paths(&t);
+            let stdlib = self.get_stdlib(handle);
+            let symbol_def_paths = collect_symbol_def_paths_with_stdlib(&t, stdlib.as_ref());
 
             if !symbol_def_paths.is_empty() {
                 return symbol_def_paths.map(|(qname, _)| {