1 files changed, 8 insertions, 1 deletions

diff --git a/crates/ra_analysis/src/hover.rs b/crates/ra_analysis/src/hover.rs
index ba1fb9beb..067e5c12d 100644
--- a/crates/ra_analysis/src/hover.rs
+++ b/crates/ra_analysis/src/hover.rs
@@ -64,7 +64,14 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Cancelable<Option
         parent_fn
     )?);
     let infer = function.infer(db)?;
-    Ok(infer.type_of_node(node).map(|t| t.to_string()))
+    let syntax_mapping = function.body_syntax_mapping(db)?;
+    if let Some(expr) = syntax_mapping.node_expr(node) {
+        Ok(Some(infer[expr].to_string()))
+    } else if let Some(pat) = syntax_mapping.node_pat(node) {
+        Ok(Some(infer[pat].to_string()))
+    } else {
+        Ok(None)
+    }
 }
 
 // FIXME: this should not really use navigation target. Rather, approximatelly