hir: resolve associated items in docs

Author: 71

crates/hir/src/attrs.rs

@@ -18,8 +18,8 @@ use syntax::{ast, AstNode};
 
 use crate::{
     Adt, AsAssocItem, AssocItem, BuiltinType, Const, ConstParam, DocLinkDef, Enum, ExternCrateDecl,
-    Field, Function, GenericParam, Impl, LifetimeParam, Macro, Module, ModuleDef, Static, Struct,
-    Trait, TraitAlias, TypeAlias, TypeParam, Union, Variant, VariantDef,
+    Field, Function, GenericParam, HasCrate, Impl, LifetimeParam, Macro, Module, ModuleDef, Static,
+    Struct, Trait, TraitAlias, Type, TypeAlias, TypeParam, Union, Variant, VariantDef,
 };
 
 pub trait HasAttrs {
@@ -205,8 +205,9 @@ fn resolve_assoc_or_field(
         }
     };
 
-    // FIXME: Resolve associated items here, e.g. `Option::map`. Note that associated items take
-    // precedence over fields.
+    if let Some(assoc_item_def) = resolve_assoc_item(db, &ty, &name, ns) {
+        return Some(assoc_item_def);
+    }
 
     let variant_def = match ty.as_adt()? {
         Adt::Struct(it) => it.into(),
@@ -216,6 +217,35 @@ fn resolve_assoc_or_field(
     resolve_field(db, variant_def, name, ns)
 }
 
+fn resolve_assoc_item(
+    db: &dyn HirDatabase,
+    ty: &Type,
+    name: &Name,
+    ns: Option<Namespace>,
+) -> Option<DocLinkDef> {
+    ty.iterate_assoc_items(db, ty.krate(db), move |assoc_item| {
+        if assoc_item.name(db)? != *name {
+            return None;
+        }
+
+        let (def, expected_ns) = match assoc_item {
+            AssocItem::Function(it) => (ModuleDef::Function(it), Namespace::Values),
+            AssocItem::Const(it) => (ModuleDef::Const(it), Namespace::Values),
+            AssocItem::TypeAlias(it) => {
+                // Inherent associated types are supported in nightly:
+                // https://github.com/rust-lang/rust/issues/8995
+                (ModuleDef::TypeAlias(it), Namespace::Types)
+            }
+        };
+
+        if ns.unwrap_or(expected_ns) != expected_ns {
+            return None;
+        }
+
+        Some(DocLinkDef::ModuleDef(def))
+    })
+}
+
 fn resolve_field(
     db: &dyn HirDatabase,
     def: VariantDef,

crates/ide/src/doc_links/tests.rs

@@ -462,14 +462,15 @@ mod module {}
 fn doc_links_inherent_impl_items() {
     check_doc_links(
         r#"
-// /// [`Struct::CONST`]
-// /// [`Struct::function`]
-/// FIXME #9694
+/// [`Struct::CONST`]
+/// [`Struct::function`]
 struct Struct$0;
 
 impl Struct {
     const CONST: () = ();
+       // ^^^^^ Struct::CONST
     fn function() {}
+    // ^^^^^^^^ Struct::function
 }
 "#,
     )