4 files changed, 16 insertions, 28 deletions

diff --git a/crates/ra_assists/src/add_explicit_type.rs b/crates/ra_assists/src/add_explicit_type.rs
index 1dc59bb87..c50db4e21 100644
--- a/crates/ra_assists/src/add_explicit_type.rs
+++ b/crates/ra_assists/src/add_explicit_type.rs
@@ -1,7 +1,6 @@
 use hir::{
     HirDisplay, Ty,
     db::HirDatabase,
-    source_binder::function_from_child_node,
 };
 use ra_syntax::{
     SyntaxKind,
@@ -30,11 +29,8 @@ pub(crate) fn add_explicit_type(mut ctx: AssistCtx<impl HirDatabase>) -> Option<
     }
     // Infer type
     let db = ctx.db;
-    let func = function_from_child_node(db, ctx.frange.file_id, pat.syntax())?;
-    let inference_res = func.infer(db);
-    let source_map = func.body_source_map(db);
-    let expr_id = source_map.node_expr(expr.into())?;
-    let ty = inference_res[expr_id].clone();
+    let analyzer = hir::SourceAnalyser::new(db, ctx.frange.file_id, stmt.syntax());
+    let ty = analyzer.type_of(db, expr)?;
     // Assist not applicable if the type is unknown
     if is_unknown(&ty) {
         return None;
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs
index 19a2d05bc..0b2127e11 100644
--- a/crates/ra_assists/src/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/add_missing_impl_members.rs
@@ -2,7 +2,6 @@ use std::fmt::Write;
 
 use crate::{Assist, AssistId, AssistCtx};
 
-use hir::Resolver;
 use hir::db::HirDatabase;
 use ra_syntax::{SmolStr, SyntaxKind, TextRange, TextUnit, TreeArc};
 use ra_syntax::ast::{self, AstNode, AstToken, FnDef, ImplItem, ImplItemKind, NameOwner};
@@ -46,9 +45,9 @@ fn add_missing_impl_members_inner(
     let trait_def = {
         let file_id = ctx.frange.file_id;
         let position = FilePosition { file_id, offset: impl_node.syntax().range().start() };
-        let resolver = hir::source_binder::resolver_for_position(ctx.db, position);
+        let analyser = hir::SourceAnalyser::new(ctx.db, position.file_id, impl_node.syntax());
 
-        resolve_target_trait_def(ctx.db, &resolver, impl_node)?
+        resolve_target_trait_def(ctx.db, &analyser, impl_node)?
     };
 
     let missing_fns: Vec<_> = {
@@ -122,14 +121,14 @@ fn add_missing_impl_members_inner(
 /// implemented) to a `ast::TraitDef`.
 fn resolve_target_trait_def(
     db: &impl HirDatabase,
-    resolver: &Resolver,
+    binder: &hir::SourceAnalyser,
     impl_block: &ast::ImplBlock,
 ) -> Option<TreeArc<ast::TraitDef>> {
-    let ast_path = impl_block.target_trait().map(AstNode::syntax).and_then(ast::PathType::cast)?;
-    let hir_path = ast_path.path().and_then(hir::Path::from_ast)?;
+    let ast_path =
+        impl_block.target_trait().map(AstNode::syntax).and_then(ast::PathType::cast)?.path()?;
 
-    match resolver.resolve_path(db, &hir_path).take_types() {
-        Some(hir::Resolution::Def(hir::ModuleDef::Trait(def))) => Some(def.source(db).1),
+    match binder.resolve_path(db, &ast_path) {
+        Some(hir::PathResolution::Def(hir::ModuleDef::Trait(def))) => Some(def.source(db).1),
         _ => None,
     }
 }
diff --git a/crates/ra_assists/src/fill_match_arms.rs b/crates/ra_assists/src/fill_match_arms.rs
index da67ab667..050b1c73f 100644
--- a/crates/ra_assists/src/fill_match_arms.rs
+++ b/crates/ra_assists/src/fill_match_arms.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write;
 
 use hir::{
-    AdtDef, FieldSource, source_binder,
+    AdtDef, FieldSource,
     db::HirDatabase,
 };
 use ra_syntax::ast::{self, AstNode};
@@ -20,12 +20,8 @@ pub(crate) fn fill_match_arms(mut ctx: AssistCtx<impl HirDatabase>) -> Option<As
     }
 
     let expr = match_expr.expr()?;
-    let function =
-        source_binder::function_from_child_node(ctx.db, ctx.frange.file_id, expr.syntax())?;
-    let infer_result = function.infer(ctx.db);
-    let source_map = function.body_source_map(ctx.db);
-    let node_expr = source_map.node_expr(expr)?;
-    let match_expr_ty = infer_result[node_expr].clone();
+    let analyzer = hir::SourceAnalyser::new(ctx.db, ctx.frange.file_id, expr.syntax());
+    let match_expr_ty = analyzer.type_of(ctx.db, expr)?;
     let enum_def = match_expr_ty.autoderef(ctx.db).find_map(|ty| match ty.as_adt() {
         Some((AdtDef::Enum(e), _)) => Some(e),
         _ => None,
diff --git a/crates/ra_assists/src/fill_struct_fields.rs b/crates/ra_assists/src/fill_struct_fields.rs
index c7790dc72..e23cccbb8 100644
--- a/crates/ra_assists/src/fill_struct_fields.rs
+++ b/crates/ra_assists/src/fill_struct_fields.rs
@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use hir::{AdtDef, db::HirDatabase, source_binder::function_from_child_node};
+use hir::{AdtDef, db::HirDatabase};
 
 use ra_syntax::ast::{self, AstNode};
 
@@ -51,15 +51,12 @@ where
     }
 
     fn evaluate_struct_def_fields(&mut self) -> Option<()> {
-        let function = function_from_child_node(
+        let analyzer = hir::SourceAnalyser::new(
             self.ctx.db,
             self.ctx.frange.file_id,
             self.struct_lit.syntax(),
-        )?;
-        let infer_result = function.infer(self.ctx.db);
-        let source_map = function.body_source_map(self.ctx.db);
-        let node_expr = source_map.node_expr(self.struct_lit.into())?;
-        let struct_lit_ty = infer_result[node_expr].clone();
+        );
+        let struct_lit_ty = analyzer.type_of(self.ctx.db, self.struct_lit.into())?;
         let struct_def = match struct_lit_ty.as_adt() {
             Some((AdtDef::Struct(s), _)) => s,
             _ => return None,