From 6210e82041849bad6129331b9e45ac0bae6fe569 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 6 Jan 2019 16:47:59 +0100
Subject: Use HIR Expr for type inference

Now we can reuse the type inference inside a function when typing whitespace
etc. :)
---
 crates/ra_analysis/src/completion/complete_dot.rs | 14 +++++++++-----
 crates/ra_analysis/src/hover.rs                   |  9 ++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'crates/ra_analysis')

diff --git a/crates/ra_analysis/src/completion/complete_dot.rs b/crates/ra_analysis/src/completion/complete_dot.rs
index 031d8b98f..ef3f4271b 100644
--- a/crates/ra_analysis/src/completion/complete_dot.rs
+++ b/crates/ra_analysis/src/completion/complete_dot.rs
@@ -1,3 +1,4 @@
+use ra_db::LocalSyntaxPtr;
 use ra_syntax::ast::AstNode;
 use hir::{Ty, Def};
 
@@ -11,11 +12,14 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) -> Ca
         _ => return Ok(()),
     };
     let infer_result = function.infer(ctx.db)?;
-    let receiver_ty = if let Some(ty) = infer_result.type_of_node(receiver.syntax()) {
-        ty
-    } else {
-        return Ok(());
-    };
+    let syntax_mapping = function.body_syntax_mapping(ctx.db)?;
+    let expr =
+        if let Some(expr) = syntax_mapping.syntax_expr(LocalSyntaxPtr::new(receiver.syntax())) {
+            expr
+        } else {
+            return Ok(());
+        };
+    let receiver_ty = infer_result[expr].clone();
     if !ctx.is_method_call {
         complete_fields(acc, ctx, receiver_ty)?;
     }
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
-- 
cgit v1.2.3


From 2dfb5e6ac03e9cc6973dffe9ad69e858510604ee Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Mon, 7 Jan 2019 00:03:30 +0100
Subject: Improve types for node_expr / node_pat

---
 crates/ra_analysis/src/completion/complete_dot.rs | 12 ++++--------
 crates/ra_analysis/src/hover.rs                   |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'crates/ra_analysis')

diff --git a/crates/ra_analysis/src/completion/complete_dot.rs b/crates/ra_analysis/src/completion/complete_dot.rs
index ef3f4271b..54ce1b638 100644
--- a/crates/ra_analysis/src/completion/complete_dot.rs
+++ b/crates/ra_analysis/src/completion/complete_dot.rs
@@ -1,5 +1,3 @@
-use ra_db::LocalSyntaxPtr;
-use ra_syntax::ast::AstNode;
 use hir::{Ty, Def};
 
 use crate::Cancelable;
@@ -13,12 +11,10 @@ pub(super) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) -> Ca
     };
     let infer_result = function.infer(ctx.db)?;
     let syntax_mapping = function.body_syntax_mapping(ctx.db)?;
-    let expr =
-        if let Some(expr) = syntax_mapping.syntax_expr(LocalSyntaxPtr::new(receiver.syntax())) {
-            expr
-        } else {
-            return Ok(());
-        };
+    let expr = match syntax_mapping.node_expr(receiver) {
+        Some(expr) => expr,
+        None => return Ok(()),
+    };
     let receiver_ty = infer_result[expr].clone();
     if !ctx.is_method_call {
         complete_fields(acc, ctx, receiver_ty)?;
diff --git a/crates/ra_analysis/src/hover.rs b/crates/ra_analysis/src/hover.rs
index 067e5c12d..06632df4f 100644
--- a/crates/ra_analysis/src/hover.rs
+++ b/crates/ra_analysis/src/hover.rs
@@ -65,9 +65,9 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Cancelable<Option
     )?);
     let infer = function.infer(db)?;
     let syntax_mapping = function.body_syntax_mapping(db)?;
-    if let Some(expr) = syntax_mapping.node_expr(node) {
+    if let Some(expr) = ast::Expr::cast(node).and_then(|e| syntax_mapping.node_expr(e)) {
         Ok(Some(infer[expr].to_string()))
-    } else if let Some(pat) = syntax_mapping.node_pat(node) {
+    } else if let Some(pat) = ast::Pat::cast(node).and_then(|p| syntax_mapping.node_pat(p)) {
         Ok(Some(infer[pat].to_string()))
     } else {
         Ok(None)
-- 
cgit v1.2.3