language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Clarify the names one more time

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-15 17:33:32 +02:00
parent 56e67e3a39
commit c5868a4879
7 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide/src/goto_definition.rs
View file

@ -40,7 +40,7 @@ pub(crate) fn goto_definition(
reference_definition(&sema, &name_ref).to_vec()
},
ast::Name(name) => {
let def = NameClass::classify(&sema, &name)?.reference_or_definition(sema.db);
let def = NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db);
let nav = def.try_to_nav(sema.db)?;
vec![nav]
},
@ -83,7 +83,7 @@ pub(crate) fn reference_definition(
) -> ReferenceResult {
let name_kind = NameRefClass::classify(sema, name_ref);
if let Some(def) = name_kind {
let def = def.definition(sema.db);
let def = def.referenced(sema.db);
return match def.try_to_nav(sema.db) {
Some(nav) => ReferenceResult::Exact(nav),
None => ReferenceResult::Approximate(Vec::new()),