3 files changed, 22 insertions, 47 deletions

diff --git a/crates/ra_ide_api/src/references/classify.rs b/crates/ra_ide_api/src/references/classify.rs
index 153082d5b..217f9951e 100644
--- a/crates/ra_ide_api/src/references/classify.rs
+++ b/crates/ra_ide_api/src/references/classify.rs
@@ -1,13 +1,13 @@
 //! Functions that are used to classify an element from its definition or reference.
 
-use hir::{Either, FromSource, Module, ModuleSource, Path, PathResolution, Source, SourceAnalyzer};
+use hir::{FromSource, Module, ModuleSource, Path, PathResolution, Source, SourceAnalyzer};
 use ra_db::FileId;
 use ra_prof::profile;
-use ra_syntax::{ast, match_ast, AstNode, AstPtr};
+use ra_syntax::{ast, match_ast, AstNode};
 use test_utils::tested_by;
 
 use super::{
-    name_definition::{from_assoc_item, from_module_def, from_pat, from_struct_field},
+    name_definition::{from_assoc_item, from_module_def, from_struct_field},
     NameDefinition, NameKind,
 };
 use crate::db::RootDatabase;
@@ -25,7 +25,13 @@ pub(crate) fn classify_name(
     match_ast! {
         match parent {
             ast::BindPat(it) => {
-                from_pat(db, file_id, AstPtr::new(&it))
+                let src = hir::Source { file_id, ast: it };
+                let local = hir::Local::from_source(db, src)?;
+                Some(NameDefinition {
+                    visibility: None,
+                    container: local.module(db),
+                    kind: NameKind::Local(local),
+                })
             },
             ast::RecordFieldDef(it) => {
                 let ast = hir::FieldSource::Named(it);
@@ -159,10 +165,10 @@ pub(crate) fn classify_name_ref(
     match resolved {
         Def(def) => Some(from_module_def(db, def, Some(container))),
         AssocItem(item) => Some(from_assoc_item(db, item)),
-        LocalBinding(Either::A(pat)) => from_pat(db, file_id, pat),
-        LocalBinding(Either::B(par)) => {
-            let kind = NameKind::SelfParam(par);
-            Some(NameDefinition { kind, container, visibility })
+        Local(local) => {
+            let container = local.module(db);
+            let kind = NameKind::Local(local);
+            Some(NameDefinition { kind, container, visibility: None })
         }
         GenericParam(par) => {
             // FIXME: get generic param def
diff --git a/crates/ra_ide_api/src/references/name_definition.rs b/crates/ra_ide_api/src/references/name_definition.rs
index 4580bc789..ccd75278a 100644
--- a/crates/ra_ide_api/src/references/name_definition.rs
+++ b/crates/ra_ide_api/src/references/name_definition.rs
@@ -4,10 +4,10 @@
 //! Note that the reference search is possible for not all of the classified items.
 
 use hir::{
-    db::AstDatabase, Adt, AssocItem, DefWithBody, FromSource, HasSource, HirFileId, MacroDef,
-    Module, ModuleDef, StructField, Ty, VariantDef,
+    Adt, AssocItem, GenericParam, HasSource, Local, MacroDef, Module, ModuleDef, StructField, Ty,
+    VariantDef,
 };
-use ra_syntax::{ast, ast::VisibilityOwner, match_ast, AstNode, AstPtr};
+use ra_syntax::{ast, ast::VisibilityOwner};
 
 use crate::db::RootDatabase;
 
@@ -18,9 +18,8 @@ pub enum NameKind {
     AssocItem(AssocItem),
     Def(ModuleDef),
     SelfType(Ty),
-    Pat((DefWithBody, AstPtr<ast::BindPat>)),
-    SelfParam(AstPtr<ast::SelfParam>),
-    GenericParam(u32),
+    Local(Local),
+    GenericParam(GenericParam),
 }
 
 #[derive(PartialEq, Eq)]
@@ -30,36 +29,6 @@ pub(crate) struct NameDefinition {
     pub kind: NameKind,
 }
 
-pub(super) fn from_pat(
-    db: &RootDatabase,
-    file_id: HirFileId,
-    pat: AstPtr<ast::BindPat>,
-) -> Option<NameDefinition> {
-    let root = db.parse_or_expand(file_id)?;
-    let def = pat.to_node(&root).syntax().ancestors().find_map(|node| {
-        match_ast! {
-            match node {
-                ast::FnDef(it) => {
-                    let src = hir::Source { file_id, ast: it };
-                    Some(hir::Function::from_source(db, src)?.into())
-                },
-                ast::ConstDef(it) => {
-                    let src = hir::Source { file_id, ast: it };
-                    Some(hir::Const::from_source(db, src)?.into())
-                },
-                ast::StaticDef(it) => {
-                    let src = hir::Source { file_id, ast: it };
-                    Some(hir::Static::from_source(db, src)?.into())
-                },
-                _ => None,
-            }
-        }
-    })?;
-    let kind = NameKind::Pat((def, pat));
-    let container = def.module(db);
-    Some(NameDefinition { kind, container, visibility: None })
-}
-
 pub(super) fn from_assoc_item(db: &RootDatabase, item: AssocItem) -> NameDefinition {
     let container = item.module(db);
     let visibility = match item {
diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
index f2789e0b2..2907787c2 100644
--- a/crates/ra_ide_api/src/references/search_scope.rs
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -71,13 +71,13 @@ impl NameDefinition {
         let module_src = self.container.definition_source(db);
         let file_id = module_src.file_id.original_file(db);
 
-        if let NameKind::Pat((def, _)) = self.kind {
-            let mut res = FxHashMap::default();
-            let range = match def {
+        if let NameKind::Local(var) = self.kind {
+            let range = match var.parent(db) {
                 DefWithBody::Function(f) => f.source(db).ast.syntax().text_range(),
                 DefWithBody::Const(c) => c.source(db).ast.syntax().text_range(),
                 DefWithBody::Static(s) => s.source(db).ast.syntax().text_range(),
             };
+            let mut res = FxHashMap::default();
             res.insert(file_id, Some(range));
             return SearchScope::new(res);
         }