aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src/references.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-06 15:23:28 +0000
committerAleksey Kladov <[email protected]>2020-02-06 15:23:28 +0000
commit271017e6bf5b5f46464d09db7fc869c92998fc80 (patch)
tree76227de73a33f3dd51d74d6736cf425a8a89bb64 /crates/ra_ide/src/references.rs
parentf8dde21fe9ccceea0b3dea83d646a45a409a0e3f (diff)
Move NameKind up
Diffstat (limited to 'crates/ra_ide/src/references.rs')
-rw-r--r--crates/ra_ide/src/references.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index b47f8bcd9..c215040f4 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -10,7 +10,6 @@
10//! resolved to the search element definition, we get a reference. 10//! resolved to the search element definition, we get a reference.
11 11
12mod classify; 12mod classify;
13mod name_definition;
14mod rename; 13mod rename;
15mod search_scope; 14mod search_scope;
16 15
@@ -29,9 +28,9 @@ use crate::{display::ToNav, FilePosition, FileRange, NavigationTarget, RangeInfo
29 28
30pub(crate) use self::{ 29pub(crate) use self::{
31 classify::{classify_name, classify_name_ref}, 30 classify::{classify_name, classify_name_ref},
32 name_definition::{NameDefinition, NameKind},
33 rename::rename, 31 rename::rename,
34}; 32};
33pub(crate) use ra_ide_db::defs::{NameDefinition, NameKind};
35 34
36pub use self::search_scope::SearchScope; 35pub use self::search_scope::SearchScope;
37 36
@@ -137,7 +136,7 @@ pub(crate) fn find_all_refs(
137 }; 136 };
138 137
139 let search_scope = { 138 let search_scope = {
140 let base = def.search_scope(db); 139 let base = SearchScope::for_def(&def, db);
141 match search_scope { 140 match search_scope {
142 None => base, 141 None => base,
143 Some(scope) => base.intersection(&scope), 142 Some(scope) => base.intersection(&scope),