aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/references.rs
diff options
context:
space:
mode:
authorEkaterina Babshukova <[email protected]>2019-10-12 18:30:53 +0100
committerEkaterina Babshukova <[email protected]>2019-10-22 21:47:31 +0100
commit835173d065dbe1fdd7369ea49336c0b785be8cb8 (patch)
treee19916b78f4fff145ec59b790c626e2a9f538bbb /crates/ra_ide_api/src/references.rs
parentd26d0ada50fd0063c03e28bc2673f9f63fd23d95 (diff)
replace trait by a bunch of functions
Diffstat (limited to 'crates/ra_ide_api/src/references.rs')
-rw-r--r--crates/ra_ide_api/src/references.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_ide_api/src/references.rs b/crates/ra_ide_api/src/references.rs
index f54542787..3761fd6e7 100644
--- a/crates/ra_ide_api/src/references.rs
+++ b/crates/ra_ide_api/src/references.rs
@@ -1,7 +1,7 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3mod classify; 3mod classify;
4mod definition; 4mod name_definition;
5mod rename; 5mod rename;
6mod search_scope; 6mod search_scope;
7 7
@@ -12,7 +12,7 @@ use crate::{db::RootDatabase, FileId, FilePosition, FileRange, NavigationTarget,
12 12
13pub(crate) use self::{ 13pub(crate) use self::{
14 classify::{classify_name, classify_name_ref}, 14 classify::{classify_name, classify_name_ref},
15 definition::{Definition, NameKind}, 15 name_definition::{NameDefinition, NameKind},
16 rename::rename, 16 rename::rename,
17}; 17};
18 18
@@ -63,7 +63,7 @@ pub(crate) fn find_all_refs(
63 63
64 let declaration = match def.item { 64 let declaration = match def.item {
65 NameKind::Macro(mac) => NavigationTarget::from_macro_def(db, mac), 65 NameKind::Macro(mac) => NavigationTarget::from_macro_def(db, mac),
66 NameKind::FieldAccess(field) => NavigationTarget::from_field(db, field), 66 NameKind::Field(field) => NavigationTarget::from_field(db, field),
67 NameKind::AssocItem(assoc) => NavigationTarget::from_assoc_item(db, assoc), 67 NameKind::AssocItem(assoc) => NavigationTarget::from_assoc_item(db, assoc),
68 NameKind::Def(def) => NavigationTarget::from_def(db, def)?, 68 NameKind::Def(def) => NavigationTarget::from_def(db, def)?,
69 NameKind::SelfType(ref ty) => match ty.as_adt() { 69 NameKind::SelfType(ref ty) => match ty.as_adt() {
@@ -84,7 +84,7 @@ fn find_name<'a>(
84 db: &RootDatabase, 84 db: &RootDatabase,
85 syntax: &SyntaxNode, 85 syntax: &SyntaxNode,
86 position: FilePosition, 86 position: FilePosition,
87) -> Option<RangeInfo<(String, Definition)>> { 87) -> Option<RangeInfo<(String, NameDefinition)>> {
88 if let Some(name) = find_node_at_offset::<ast::Name>(&syntax, position.offset) { 88 if let Some(name) = find_node_at_offset::<ast::Name>(&syntax, position.offset) {
89 let def = classify_name(db, position.file_id, &name)?; 89 let def = classify_name(db, position.file_id, &name)?;
90 let range = name.syntax().text_range(); 90 let range = name.syntax().text_range();
@@ -96,7 +96,7 @@ fn find_name<'a>(
96 Some(RangeInfo::new(range, (name_ref.text().to_string(), def))) 96 Some(RangeInfo::new(range, (name_ref.text().to_string(), def)))
97} 97}
98 98
99fn process_definition(db: &RootDatabase, def: Definition, name: String) -> Vec<FileRange> { 99fn process_definition(db: &RootDatabase, def: NameDefinition, name: String) -> Vec<FileRange> {
100 let pat = name.as_str(); 100 let pat = name.as_str();
101 let scope = def.scope(db).scope; 101 let scope = def.scope(db).scope;
102 let mut refs = vec![]; 102 let mut refs = vec![];