diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-03 17:41:25 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-03 17:41:25 +0000 |
commit | 074474fe00a08d394cbdcac2a136bca825d93377 (patch) | |
tree | 0be46628b67ddfaa15be54520cdc41a03977a76a /crates/ra_ide/src/references.rs | |
parent | 7a322f9afff05b88507a6956a2d84a3abef0a0d6 (diff) | |
parent | 34d6e22fc12209417c15d215052857ddac79cdf4 (diff) |
Merge #3427
3427: Rename NameDefinition -> Definition r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/references.rs')
-rw-r--r-- | crates/ra_ide/src/references.rs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs index c9c9c6483..95a5c1914 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_ref, NameRefClass}, | 31 | classify::{classify_name_ref, NameRefClass}, |
32 | rename::rename, | 32 | rename::rename, |
33 | }; | 33 | }; |
34 | pub(crate) use ra_ide_db::defs::{classify_name, NameDefinition}; | 34 | pub(crate) use ra_ide_db::defs::{classify_name, Definition}; |
35 | 35 | ||
36 | pub use self::search_scope::SearchScope; | 36 | pub use self::search_scope::SearchScope; |
37 | 37 | ||
@@ -145,7 +145,7 @@ pub(crate) fn find_all_refs( | |||
145 | 145 | ||
146 | pub(crate) fn find_refs_to_def( | 146 | pub(crate) fn find_refs_to_def( |
147 | db: &RootDatabase, | 147 | db: &RootDatabase, |
148 | def: &NameDefinition, | 148 | def: &Definition, |
149 | search_scope: Option<SearchScope>, | 149 | search_scope: Option<SearchScope>, |
150 | ) -> Vec<Reference> { | 150 | ) -> Vec<Reference> { |
151 | let search_scope = { | 151 | let search_scope = { |
@@ -169,7 +169,7 @@ fn find_name( | |||
169 | syntax: &SyntaxNode, | 169 | syntax: &SyntaxNode, |
170 | position: FilePosition, | 170 | position: FilePosition, |
171 | opt_name: Option<ast::Name>, | 171 | opt_name: Option<ast::Name>, |
172 | ) -> Option<RangeInfo<NameDefinition>> { | 172 | ) -> Option<RangeInfo<Definition>> { |
173 | if let Some(name) = opt_name { | 173 | if let Some(name) = opt_name { |
174 | let def = classify_name(sema, &name)?.definition(); | 174 | let def = classify_name(sema, &name)?.definition(); |
175 | let range = name.syntax().text_range(); | 175 | let range = name.syntax().text_range(); |
@@ -183,7 +183,7 @@ fn find_name( | |||
183 | 183 | ||
184 | fn process_definition( | 184 | fn process_definition( |
185 | db: &RootDatabase, | 185 | db: &RootDatabase, |
186 | def: &NameDefinition, | 186 | def: &Definition, |
187 | name: String, | 187 | name: String, |
188 | scope: SearchScope, | 188 | scope: SearchScope, |
189 | ) -> Vec<Reference> { | 189 | ) -> Vec<Reference> { |
@@ -250,13 +250,9 @@ fn process_definition( | |||
250 | refs | 250 | refs |
251 | } | 251 | } |
252 | 252 | ||
253 | fn decl_access( | 253 | fn decl_access(def: &Definition, syntax: &SyntaxNode, range: TextRange) -> Option<ReferenceAccess> { |
254 | def: &NameDefinition, | ||
255 | syntax: &SyntaxNode, | ||
256 | range: TextRange, | ||
257 | ) -> Option<ReferenceAccess> { | ||
258 | match def { | 254 | match def { |
259 | NameDefinition::Local(_) | NameDefinition::StructField(_) => {} | 255 | Definition::Local(_) | Definition::StructField(_) => {} |
260 | _ => return None, | 256 | _ => return None, |
261 | }; | 257 | }; |
262 | 258 | ||
@@ -273,10 +269,10 @@ fn decl_access( | |||
273 | None | 269 | None |
274 | } | 270 | } |
275 | 271 | ||
276 | fn reference_access(def: &NameDefinition, name_ref: &ast::NameRef) -> Option<ReferenceAccess> { | 272 | fn reference_access(def: &Definition, name_ref: &ast::NameRef) -> Option<ReferenceAccess> { |
277 | // Only Locals and Fields have accesses for now. | 273 | // Only Locals and Fields have accesses for now. |
278 | match def { | 274 | match def { |
279 | NameDefinition::Local(_) | NameDefinition::StructField(_) => {} | 275 | Definition::Local(_) | Definition::StructField(_) => {} |
280 | _ => return None, | 276 | _ => return None, |
281 | }; | 277 | }; |
282 | 278 | ||