diff options
Diffstat (limited to 'crates/ra_ide_api/src/references.rs')
-rw-r--r-- | crates/ra_ide_api/src/references.rs | 10 |
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 | ||
3 | mod classify; | 3 | mod classify; |
4 | mod definition; | 4 | mod name_definition; |
5 | mod rename; | 5 | mod rename; |
6 | mod search_scope; | 6 | mod search_scope; |
7 | 7 | ||
@@ -12,7 +12,7 @@ use crate::{db::RootDatabase, FileId, FilePosition, FileRange, NavigationTarget, | |||
12 | 12 | ||
13 | pub(crate) use self::{ | 13 | pub(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 | ||
99 | fn process_definition(db: &RootDatabase, def: Definition, name: String) -> Vec<FileRange> { | 99 | fn 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![]; |