3 files changed, 34 insertions, 82 deletions

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index e1cb12cca..9f59d590c 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -45,8 +45,7 @@ pub use crate::{
         StructField, Trait, Type, TypeAlias, TypeParam, Union, VariantDef,
     },
     has_source::HasSource,
-    semantics::{original_range, Semantics, SemanticsScope},
-    source_analyzer::PathResolution,
+    semantics::{original_range, PathResolution, Semantics, SemanticsScope},
 };
 
 pub use hir_def::{
diff --git a/crates/ra_hir/src/semantics.rs b/crates/ra_hir/src/semantics.rs
index afc7f7ee7..965d185a4 100644
--- a/crates/ra_hir/src/semantics.rs
+++ b/crates/ra_hir/src/semantics.rs
@@ -19,11 +19,24 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use crate::{
     db::HirDatabase,
     semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
-    source_analyzer::{resolve_hir_path, ReferenceDescriptor, SourceAnalyzer},
-    Function, HirFileId, InFile, Local, MacroDef, Module, ModuleDef, Name, Origin, Path,
-    PathResolution, ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
+    source_analyzer::{resolve_hir_path, SourceAnalyzer},
+    AssocItem, Function, HirFileId, ImplDef, InFile, Local, MacroDef, Module, ModuleDef, Name,
+    Origin, Path, ScopeDef, StructField, Trait, Type, TypeParam, VariantDef,
 };
 
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum PathResolution {
+    /// An item
+    Def(ModuleDef),
+    /// A local binding (only value namespace)
+    Local(Local),
+    /// A generic parameter
+    TypeParam(TypeParam),
+    SelfType(ImplDef),
+    Macro(MacroDef),
+    AssocItem(AssocItem),
+}
+
 /// Primary API to get semantic information, like types, from syntax trees.
 pub struct Semantics<'db, DB> {
     pub db: &'db DB,
@@ -171,12 +184,6 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
         SemanticsScope { db: self.db, resolver }
     }
 
-    // FIXME: we only use this in `inline_local_variable` assist, ideally, we
-    // should switch to general reference search infra there.
-    pub fn find_all_refs(&self, pat: &ast::BindPat) -> Vec<ReferenceDescriptor> {
-        self.analyze(pat.syntax()).find_all_refs(pat)
-    }
-
     fn analyze(&self, node: &SyntaxNode) -> SourceAnalyzer {
         let src = self.find_file(node.clone());
         self.analyze2(src.as_ref(), None)
diff --git a/crates/ra_hir/src/source_analyzer.rs b/crates/ra_hir/src/source_analyzer.rs
index 015389fb0..f3f1ed05a 100644
--- a/crates/ra_hir/src/source_analyzer.rs
+++ b/crates/ra_hir/src/source_analyzer.rs
@@ -7,7 +7,6 @@
 //! purely for "IDE needs".
 use std::{iter::once, sync::Arc};
 
-use either::Either;
 use hir_def::{
     body::{
         scope::{ExprScopes, ScopeId},
@@ -21,12 +20,12 @@ use hir_expand::{hygiene::Hygiene, name::AsName, HirFileId, InFile};
 use hir_ty::{InEnvironment, InferenceResult, TraitEnvironment};
 use ra_syntax::{
     ast::{self, AstNode},
-    AstPtr, SyntaxNode, SyntaxNodePtr, TextRange, TextUnit,
+    SyntaxNode, SyntaxNodePtr, TextUnit,
 };
 
 use crate::{
-    db::HirDatabase, Adt, Const, EnumVariant, Function, Local, MacroDef, ModPath, ModuleDef, Path,
-    PathKind, Static, Struct, Trait, Type, TypeAlias, TypeParam,
+    db::HirDatabase, semantics::PathResolution, Adt, Const, EnumVariant, Function, Local, MacroDef,
+    ModPath, ModuleDef, Path, PathKind, Static, Struct, Trait, Type, TypeAlias, TypeParam,
 };
 
 /// `SourceAnalyzer` is a convenience wrapper which exposes HIR API in terms of
@@ -41,25 +40,6 @@ pub(crate) struct SourceAnalyzer {
     scopes: Option<Arc<ExprScopes>>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum PathResolution {
-    /// An item
-    Def(crate::ModuleDef),
-    /// A local binding (only value namespace)
-    Local(Local),
-    /// A generic parameter
-    TypeParam(TypeParam),
-    SelfType(crate::ImplDef),
-    Macro(MacroDef),
-    AssocItem(crate::AssocItem),
-}
-
-#[derive(Debug)]
-pub struct ReferenceDescriptor {
-    pub range: TextRange,
-    pub name: String,
-}
-
 impl SourceAnalyzer {
     pub(crate) fn new_for_body(
         db: &impl HirDatabase,
@@ -111,20 +91,16 @@ impl SourceAnalyzer {
     fn expand_expr(
         &self,
         db: &impl HirDatabase,
-        expr: InFile<&ast::Expr>,
+        expr: InFile<ast::MacroCall>,
     ) -> Option<InFile<ast::Expr>> {
-        let macro_call = ast::MacroCall::cast(expr.value.syntax().clone())?;
-        let macro_file =
-            self.body_source_map.as_ref()?.node_macro_file(expr.with_value(&macro_call))?;
+        let macro_file = self.body_source_map.as_ref()?.node_macro_file(expr.as_ref())?;
         let expanded = db.parse_or_expand(macro_file)?;
-        let kind = expanded.kind();
-        let expr = InFile::new(macro_file, ast::Expr::cast(expanded)?);
 
-        if ast::MacroCall::can_cast(kind) {
-            self.expand_expr(db, expr.as_ref())
-        } else {
-            Some(expr)
-        }
+        let res = match ast::MacroCall::cast(expanded.clone()) {
+            Some(call) => self.expand_expr(db, InFile::new(macro_file, call))?,
+            _ => InFile::new(macro_file, ast::Expr::cast(expanded)?),
+        };
+        Some(res)
     }
 
     fn trait_env(&self, db: &impl HirDatabase) -> Arc<TraitEnvironment> {
@@ -132,11 +108,13 @@ impl SourceAnalyzer {
     }
 
     pub(crate) fn type_of(&self, db: &impl HirDatabase, expr: &ast::Expr) -> Option<Type> {
-        let expr_id = if let Some(expr) = self.expand_expr(db, InFile::new(self.file_id, expr)) {
-            self.body_source_map.as_ref()?.node_expr(expr.as_ref())?
-        } else {
-            self.expr_id(expr)?
-        };
+        let expr_id = match expr {
+            ast::Expr::MacroCall(call) => {
+                let expr = self.expand_expr(db, InFile::new(self.file_id, call.clone()))?;
+                self.body_source_map.as_ref()?.node_expr(expr.as_ref())
+            }
+            _ => self.expr_id(expr),
+        }?;
 
         let ty = self.infer.as_ref()?[expr_id].clone();
         let environment = self.trait_env(db);
@@ -251,38 +229,6 @@ impl SourceAnalyzer {
         resolve_hir_path(db, &self.resolver, &hir_path)
     }
 
-    fn resolve_local_name(
-        &self,
-        name_ref: &ast::NameRef,
-    ) -> Option<Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>> {
-        let name = name_ref.as_name();
-        let source_map = self.body_source_map.as_ref()?;
-        let scopes = self.scopes.as_ref()?;
-        let scope = scope_for(scopes, source_map, InFile::new(self.file_id, name_ref.syntax()))?;
-        let entry = scopes.resolve_name_in_scope(scope, &name)?;
-        Some(source_map.pat_syntax(entry.pat())?.value)
-    }
-
-    // FIXME: we only use this in `inline_local_variable` assist, ideally, we
-    // should switch to general reference search infra there.
-    pub(crate) fn find_all_refs(&self, pat: &ast::BindPat) -> Vec<ReferenceDescriptor> {
-        let fn_def = pat.syntax().ancestors().find_map(ast::FnDef::cast).unwrap();
-        let ptr = Either::Left(AstPtr::new(&ast::Pat::from(pat.clone())));
-        fn_def
-            .syntax()
-            .descendants()
-            .filter_map(ast::NameRef::cast)
-            .filter(|name_ref| match self.resolve_local_name(&name_ref) {
-                None => false,
-                Some(d_ptr) => d_ptr == ptr,
-            })
-            .map(|name_ref| ReferenceDescriptor {
-                name: name_ref.text().to_string(),
-                range: name_ref.syntax().text_range(),
-            })
-            .collect()
-    }
-
     pub(crate) fn expand(
         &self,
         db: &impl HirDatabase,