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

More idiomatic classification API

Browse source
This commit is contained in:
Aleksey Kladov 2020-10-15 17:27:50 +02:00
parent f9c1336873
commit 56e67e3a39
11 changed files with 206 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
use hir::Semantics;
use ide_db::{
defs::{classify_name, classify_name_ref},
defs::{NameClass, NameRefClass},
symbol_index, RootDatabase,
};
use syntax::{
@ -40,7 +40,7 @@ pub(crate) fn goto_definition(
reference_definition(&sema, &name_ref).to_vec()
},
ast::Name(name) => {
let def = classify_name(&sema, &name)?.reference_or_definition(sema.db);
let def = NameClass::classify(&sema, &name)?.reference_or_definition(sema.db);
let nav = def.try_to_nav(sema.db)?;
vec![nav]
},
@ -81,7 +81,7 @@ pub(crate) fn reference_definition(
sema: &Semantics<RootDatabase>,
name_ref: &ast::NameRef,
) -> ReferenceResult {
let name_kind = classify_name_ref(sema, name_ref);
let name_kind = NameRefClass::classify(sema, name_ref);
if let Some(def) = name_kind {
let def = def.definition(sema.db);
return match def.try_to_nav(sema.db) {