1 files changed, 63 insertions, 14 deletions

diff --git a/crates/ra_ide_api/src/search_scope.rs b/crates/ra_ide_api/src/search_scope.rs
index 1cf1aed37..9fcbdcc3a 100644
--- a/crates/ra_ide_api/src/search_scope.rs
+++ b/crates/ra_ide_api/src/search_scope.rs
@@ -1,18 +1,69 @@
-use hir::{DefWithBody, HasSource, ModuleSource};
+use hir::{
+    source_binder::ReferenceDescriptor, DefWithBody, HasSource, ModuleSource, SourceAnalyzer,
+};
 use ra_db::{FileId, SourceDatabase};
-use ra_syntax::{AstNode, TextRange};
+use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SourceFile, TextRange, TextUnit};
 
 use crate::{
     db::RootDatabase,
-    name_kind::{Declaration, NameKind},
+    name_kind::{classify_name_ref, Definition, NameKind},
 };
 
-pub struct SearchScope {
+pub(crate) struct SearchScope {
     pub scope: Vec<(FileId, Option<TextRange>)>,
 }
 
-impl Declaration {
-    pub fn scope(self, db: &RootDatabase) -> Option<SearchScope> {
+pub(crate) fn find_refs(
+    db: &RootDatabase,
+    def: Definition,
+    name: String,
+) -> Vec<ReferenceDescriptor> {
+    let pat = name.as_str();
+    let scope = def.scope(db).scope;
+    let mut refs = vec![];
+
+    let is_match = |file_id: FileId, name_ref: &ast::NameRef| -> bool {
+        let analyzer = SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
+        let classified = classify_name_ref(db, file_id, &analyzer, &name_ref);
+        if let Some(d) = classified {
+            d == def
+        } else {
+            false
+        }
+    };
+
+    for (file_id, text_range) in scope {
+        let text = db.file_text(file_id);
+        let parse = SourceFile::parse(&text);
+        let syntax = parse.tree().syntax().clone();
+
+        for (idx, _) in text.match_indices(pat) {
+            let offset = TextUnit::from_usize(idx);
+            if let Some(name_ref) = find_node_at_offset::<ast::NameRef>(&syntax, offset) {
+                let name_range = name_ref.syntax().text_range();
+
+                if let Some(range) = text_range {
+                    if name_range.is_subrange(&range) && is_match(file_id, &name_ref) {
+                        refs.push(ReferenceDescriptor {
+                            name: name_ref.text().to_string(),
+                            range: name_ref.syntax().text_range(),
+                        });
+                    }
+                } else if is_match(file_id, &name_ref) {
+                    refs.push(ReferenceDescriptor {
+                        name: name_ref.text().to_string(),
+                        range: name_ref.syntax().text_range(),
+                    });
+                }
+            }
+        }
+    }
+
+    return refs;
+}
+
+impl Definition {
+    pub fn scope(&self, db: &RootDatabase) -> SearchScope {
         let module_src = self.container.definition_source(db);
         let file_id = module_src.file_id.original_file(db);
 
@@ -22,16 +73,16 @@ impl Declaration {
                 DefWithBody::Const(c) => c.source(db).ast.syntax().text_range(),
                 DefWithBody::Static(s) => s.source(db).ast.syntax().text_range(),
             };
-            return Some(SearchScope { scope: vec![(file_id, Some(range))] });
+            return SearchScope { scope: vec![(file_id, Some(range))] };
         }
 
-        if let Some(vis) = self.visibility {
+        if let Some(ref vis) = self.visibility {
             let source_root_id = db.file_source_root(file_id);
             let source_root = db.source_root(source_root_id);
             let mut files = source_root.walk().map(|id| (id.into(), None)).collect::<Vec<_>>();
 
             if vis.syntax().text() == "pub(crate)" {
-                return Some(SearchScope { scope: files });
+                return SearchScope { scope: files };
             }
             if vis.syntax().text() == "pub" {
                 let krate = self.container.krate(db).unwrap();
@@ -48,17 +99,15 @@ impl Declaration {
                     }
                 }
 
-                return Some(SearchScope { scope: files });
+                return SearchScope { scope: files };
             }
-            // FIXME: extend to "pub(super)" and "pub(in path)" cases,
-            // then remove `Option`
-            return None;
+            // FIXME: "pub(super)", "pub(in path)"
         }
 
         let range = match module_src.ast {
             ModuleSource::Module(m) => Some(m.syntax().text_range()),
             ModuleSource::SourceFile(_) => None,
         };
-        Some(SearchScope { scope: vec![(file_id, range)] })
+        SearchScope { scope: vec![(file_id, range)] }
     }
 }