diff options
Diffstat (limited to 'crates/ra_ide/src/references.rs')
-rw-r--r-- | crates/ra_ide/src/references.rs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index 97c08ade5..7f790a62d 100644 --- a/crates/ra_ide/src/references.rs +++ b/crates/ra_ide/src/references.rs | |||
@@ -31,7 +31,7 @@ pub(crate) use self::{ | |||
31 | classify::{classify_name, classify_name_ref}, | 31 | classify::{classify_name, classify_name_ref}, |
32 | rename::rename, | 32 | rename::rename, |
33 | }; | 33 | }; |
34 | pub(crate) use ra_ide_db::defs::{NameDefinition, NameKind}; | 34 | pub(crate) use ra_ide_db::defs::NameDefinition; |
35 | 35 | ||
36 | pub use self::search_scope::SearchScope; | 36 | pub use self::search_scope::SearchScope; |
37 | 37 | ||
@@ -126,13 +126,13 @@ pub(crate) fn find_all_refs( | |||
126 | 126 | ||
127 | let RangeInfo { range, info: (name, def) } = find_name(db, &syntax, position, opt_name)?; | 127 | let RangeInfo { range, info: (name, def) } = find_name(db, &syntax, position, opt_name)?; |
128 | 128 | ||
129 | let declaration = match def.kind { | 129 | let declaration = match def { |
130 | NameKind::Macro(mac) => mac.to_nav(db), | 130 | NameDefinition::Macro(mac) => mac.to_nav(db), |
131 | NameKind::StructField(field) => field.to_nav(db), | 131 | NameDefinition::StructField(field) => field.to_nav(db), |
132 | NameKind::ModuleDef(def) => NavigationTarget::from_def(db, def)?, | 132 | NameDefinition::ModuleDef(def) => NavigationTarget::from_def(db, def)?, |
133 | NameKind::SelfType(imp) => imp.to_nav(db), | 133 | NameDefinition::SelfType(imp) => imp.to_nav(db), |
134 | NameKind::Local(local) => local.to_nav(db), | 134 | NameDefinition::Local(local) => local.to_nav(db), |
135 | NameKind::TypeParam(_) => return None, | 135 | NameDefinition::TypeParam(_) => return None, |
136 | }; | 136 | }; |
137 | 137 | ||
138 | let search_scope = { | 138 | let search_scope = { |
@@ -148,7 +148,7 @@ pub(crate) fn find_all_refs( | |||
148 | let declaration = Declaration { | 148 | let declaration = Declaration { |
149 | nav: declaration, | 149 | nav: declaration, |
150 | kind: ReferenceKind::Other, | 150 | kind: ReferenceKind::Other, |
151 | access: decl_access(&def.kind, &name, &syntax, decl_range), | 151 | access: decl_access(&def, &name, &syntax, decl_range), |
152 | }; | 152 | }; |
153 | 153 | ||
154 | let references = process_definition(db, def, name, search_scope) | 154 | let references = process_definition(db, def, name, search_scope) |
@@ -247,7 +247,7 @@ fn process_definition( | |||
247 | refs.push(Reference { | 247 | refs.push(Reference { |
248 | file_range: FileRange { file_id, range }, | 248 | file_range: FileRange { file_id, range }, |
249 | kind, | 249 | kind, |
250 | access: reference_access(&d.kind, &name_ref.value), | 250 | access: reference_access(&d, &name_ref.value), |
251 | }); | 251 | }); |
252 | } | 252 | } |
253 | } | 253 | } |
@@ -257,13 +257,13 @@ fn process_definition( | |||
257 | } | 257 | } |
258 | 258 | ||
259 | fn decl_access( | 259 | fn decl_access( |
260 | kind: &NameKind, | 260 | def: &NameDefinition, |
261 | name: &str, | 261 | name: &str, |
262 | syntax: &SyntaxNode, | 262 | syntax: &SyntaxNode, |
263 | range: TextRange, | 263 | range: TextRange, |
264 | ) -> Option<ReferenceAccess> { | 264 | ) -> Option<ReferenceAccess> { |
265 | match kind { | 265 | match def { |
266 | NameKind::Local(_) | NameKind::StructField(_) => {} | 266 | NameDefinition::Local(_) | NameDefinition::StructField(_) => {} |
267 | _ => return None, | 267 | _ => return None, |
268 | }; | 268 | }; |
269 | 269 | ||
@@ -280,10 +280,10 @@ fn decl_access( | |||
280 | None | 280 | None |
281 | } | 281 | } |
282 | 282 | ||
283 | fn reference_access(kind: &NameKind, name_ref: &ast::NameRef) -> Option<ReferenceAccess> { | 283 | fn reference_access(def: &NameDefinition, name_ref: &ast::NameRef) -> Option<ReferenceAccess> { |
284 | // Only Locals and Fields have accesses for now. | 284 | // Only Locals and Fields have accesses for now. |
285 | match kind { | 285 | match def { |
286 | NameKind::Local(_) | NameKind::StructField(_) => {} | 286 | NameDefinition::Local(_) | NameDefinition::StructField(_) => {} |
287 | _ => return None, | 287 | _ => return None, |
288 | }; | 288 | }; |
289 | 289 | ||