3 files changed, 65 insertions, 40 deletions

diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index f7a35f05b..39a2c7a49 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -29,6 +29,7 @@ use crate::{
     Function, StructField, Path, Name,
     FnSignature, AdtDef,
     HirDatabase,
+    ImplItem,
     type_ref::{TypeRef, Mutability},
     expr::{Body, Expr, BindingAnnotation, Literal, ExprId, Pat, PatId, UnaryOp, BinaryOp, Statement, FieldPat, self},
     generics::GenericParams,
@@ -54,8 +55,8 @@ pub fn infer(db: &impl HirDatabase, func: Function) -> Arc<InferenceResult> {
     Arc::new(ctx.resolve_all())
 }
 
-#[derive(Debug, Copy, Clone)]
-enum ExprOrPatId {
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+pub enum ExprOrPatId {
     Expr(ExprId),
     Pat(PatId),
 }
@@ -79,8 +80,8 @@ pub struct InferenceResult {
     method_resolutions: FxHashMap<ExprId, Function>,
     /// For each field access expr, records the field it resolves to.
     field_resolutions: FxHashMap<ExprId, StructField>,
-    /// For each associated function call expr, records the function it resolves to
-    assoc_fn_resolutions: FxHashMap<ExprId, Function>,
+    /// For each associated item record what it resolves to
+    assoc_resolutions: FxHashMap<ExprOrPatId, ImplItem>,
     pub(super) type_of_expr: ArenaMap<ExprId, Ty>,
     pub(super) type_of_pat: ArenaMap<PatId, Ty>,
 }
@@ -92,8 +93,8 @@ impl InferenceResult {
     pub fn field_resolution(&self, expr: ExprId) -> Option<StructField> {
         self.field_resolutions.get(&expr).map(|it| *it)
     }
-    pub fn assoc_fn_resolutions(&self, expr: ExprId) -> Option<Function> {
-        self.assoc_fn_resolutions.get(&expr).map(|it| *it)
+    pub fn assoc_resolutions(&self, id: ExprOrPatId) -> Option<ImplItem> {
+        self.assoc_resolutions.get(&id).map(|it| *it)
     }
 }
 
@@ -122,7 +123,7 @@ struct InferenceContext<'a, D: HirDatabase> {
     var_unification_table: InPlaceUnificationTable<TypeVarId>,
     method_resolutions: FxHashMap<ExprId, Function>,
     field_resolutions: FxHashMap<ExprId, StructField>,
-    assoc_fn_resolutions: FxHashMap<ExprId, Function>,
+    assoc_resolutions: FxHashMap<ExprOrPatId, ImplItem>,
     type_of_expr: ArenaMap<ExprId, Ty>,
     type_of_pat: ArenaMap<PatId, Ty>,
     /// The return type of the function being inferred.
@@ -134,7 +135,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         InferenceContext {
             method_resolutions: FxHashMap::default(),
             field_resolutions: FxHashMap::default(),
-            assoc_fn_resolutions: FxHashMap::default(),
+            assoc_resolutions: FxHashMap::default(),
             type_of_expr: ArenaMap::default(),
             type_of_pat: ArenaMap::default(),
             var_unification_table: InPlaceUnificationTable::new(),
@@ -160,7 +161,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         InferenceResult {
             method_resolutions: self.method_resolutions,
             field_resolutions: self.field_resolutions,
-            assoc_fn_resolutions: self.assoc_fn_resolutions,
+            assoc_resolutions: self.assoc_resolutions,
             type_of_expr: expr_types,
             type_of_pat: pat_types,
         }
@@ -178,8 +179,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
         self.field_resolutions.insert(expr, field);
     }
 
-    fn write_assoc_fn_resolution(&mut self, expr: ExprId, func: Function) {
-        self.assoc_fn_resolutions.insert(expr, func);
+    fn write_assoc_resolution(&mut self, id: ExprOrPatId, item: ImplItem) {
+        self.assoc_resolutions.insert(id, item);
     }
 
     fn write_pat_ty(&mut self, pat: PatId, ty: Ty) {
@@ -423,26 +424,47 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             // Attempt to find an impl_item for the type which has a name matching
             // the current segment
             log::debug!("looking for path segment: {:?}", segment);
-            let item: crate::ModuleDef = ty.iterate_impl_items(self.db, |item| match item {
-                crate::ImplItem::Method(func) => {
-                    let sig = func.signature(self.db);
-                    if segment.name == *sig.name() {
-                        return Some(func.into());
+            let item: crate::ModuleDef = ty.iterate_impl_items(self.db, |item| {
+                let matching_def: Option<crate::ModuleDef> = match item {
+                    crate::ImplItem::Method(func) => {
+                        let sig = func.signature(self.db);
+                        if segment.name == *sig.name() {
+                            Some(func.into())
+                        } else {
+                            None
+                        }
                     }
-                    None
-                }
 
-                crate::ImplItem::Const(konst) => {
-                    let sig = konst.signature(self.db);
-                    if segment.name == *sig.name() {
-                        return Some(konst.into());
+                    crate::ImplItem::Const(konst) => {
+                        let sig = konst.signature(self.db);
+                        if segment.name == *sig.name() {
+                            Some(konst.into())
+                        } else {
+                            None
+                        }
                     }
-                    None
-                }
 
-                // TODO: Resolve associated types
-                crate::ImplItem::TypeAlias(_) => None,
+                    // TODO: Resolve associated types
+                    crate::ImplItem::TypeAlias(_) => None,
+                };
+                match matching_def {
+                    Some(_) => {
+                        self.write_assoc_resolution(id, item);
+                        return matching_def;
+                    }
+                    None => None,
+                }
             })?;
+
+            /*
+            if let ExprOrPatId::Expr(expr) = id {
+                match typable {
+                    TypableDef::Function(func) => self.write_assoc_fn_resolution(expr, func),
+                    _ => {}
+                };
+            }
+            */
+
             resolved = Resolution::Def(item.into());
         }
 
@@ -450,14 +472,6 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             Resolution::Def(def) => {
                 let typable: Option<TypableDef> = def.into();
                 let typable = typable?;
-
-                if let ExprOrPatId::Expr(expr) = id {
-                    match typable {
-                        TypableDef::Function(func) => self.write_assoc_fn_resolution(expr, func),
-                        _ => {}
-                    };
-                }
-
                 let substs = Ty::substs_from_path(self.db, &self.resolver, path, typable);
                 let ty = self.db.type_for_def(typable, Namespace::Values).apply_substs(substs);
                 let ty = self.insert_type_vars(ty);
diff --git a/crates/ra_ide_api/src/goto_definition.rs b/crates/ra_ide_api/src/goto_definition.rs
index e4febe8cc..3b66483cb 100644
--- a/crates/ra_ide_api/src/goto_definition.rs
+++ b/crates/ra_ide_api/src/goto_definition.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
     SyntaxNode,
 };
 use test_utils::tested_by;
-use hir::Resolution;
+use hir::{ImplItem, Resolution};
 
 use crate::{FilePosition, NavigationTarget, db::RootDatabase, RangeInfo};
 
@@ -131,14 +131,25 @@ pub(crate) fn reference_definition(
                         name_ref.syntax().ancestors().find_map(ast::PathExpr::cast)
                     {
                         let infer_result = function.infer(db);
-                        let syntax_mapping = function.body_syntax_mapping(db);
+                        let source_map = function.body_source_map(db);
                         let expr = ast::Expr::cast(path_expr.syntax()).unwrap();
 
-                        if let Some(func) = syntax_mapping
+                        if let Some(res) = source_map
                             .node_expr(expr)
-                            .and_then(|it| infer_result.assoc_fn_resolutions(it))
+                            .and_then(|it| infer_result.assoc_resolutions(it.into()))
                         {
-                            return Exact(NavigationTarget::from_function(db, func));
+                            match res {
+                                ImplItem::Method(f) => {
+                                    return Exact(NavigationTarget::from_function(db, f));
+                                }
+                                ImplItem::Const(c) => {
+                                    let (file, node) = c.source(db);
+                                    let file = file.original_file(db);
+                                    let node = &*node;
+                                    return Exact(NavigationTarget::from_named(file, node));
+                                }
+                                _ => {}
+                            }
                         }
                     }
                 }
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index 0f13777d7..bcd052c8b 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -531,7 +531,7 @@ mod tests {
             ",
         );
         let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(hover.info.first(), Some("```rust\nfn new() -> Thing\n```"));
+        assert_eq!(trim_markup_opt(hover.info.first()), Some("fn new() -> Thing"));
         assert_eq!(hover.info.is_exact(), true);
     }
 }