refactor

Author: mtshiba

crates/ty_ide/src/hover.rs

@@ -20,8 +20,21 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
     }
 
     let model = SemanticModel::new(db, file);
-    let ty =
-        goto_target.inferred_type(&model).map(|ty| match ty {
+    let ty = goto_target.inferred_type(&model);
+    let docs = goto_target
+        .get_definition_targets(
+            file,
+            db,
+            ty_python_semantic::ImportAliasResolution::ResolveAliases,
+        )
+        .and_then(|definitions| definitions.docstring(db))
+        .map(HoverContent::Docstring);
+
+    // TODO: Render the symbol's signature instead of just its type.
+    let mut contents = Vec::new();
+    if let Some(ty) = ty {
+        tracing::debug!("Inferred type of covering node is {}", ty.display(db));
+        contents.push(match ty {
             Type::KnownInstance(KnownInstanceType::TypeVar(typevar)) => typevar
                 .bind_pep695(db)
                 .map_or(HoverContent::Type(ty, None), |typevar| {
@@ -35,22 +48,7 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
             }
             _ => HoverContent::Type(ty, None),
         });
-    let docs = goto_target
-        .get_definition_targets(
-            file,
-            db,
-            ty_python_semantic::ImportAliasResolution::ResolveAliases,
-        )
-        .and_then(|definitions| definitions.docstring(db))
-        .map(HoverContent::Docstring);
-
-    if let Some(HoverContent::Type(ty, _)) = ty {
-        tracing::debug!("Inferred type of covering node is {}", ty.display(db));
     }
-
-    // TODO: Render the symbol's signature instead of just its type.
-    let mut contents = Vec::new();
-    contents.extend(ty);
     contents.extend(docs);
 
     if contents.is_empty() {