rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

restructure a bit

Browse Source
This commit is contained in:
Ekaterina Babshukova
2019-10-12 18:47:17 +03:00
parent 0dd08b8023
commit d26d0ada50
11 changed files with 869 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ra_ide_api/src/goto_definition.rs
View File

@@ -10,7 +10,7 @@ use ra_syntax::{
use crate::{
db::RootDatabase,
display::ShortLabel,
name_kind::{classify_name_ref, NameKind::*},
references::{classify_name_ref, NameKind::*},
FilePosition, NavigationTarget, RangeInfo,
};
@@ -54,8 +54,7 @@ pub(crate) fn reference_definition(
) -> ReferenceResult {
use self::ReferenceResult::*;
let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
let name_kind = classify_name_ref(db, file_id, &analyzer, &name_ref).and_then(|d| Some(d.item));
let name_kind = classify_name_ref(db, file_id, &name_ref).and_then(|d| Some(d.item));
match name_kind {
Some(Macro(mac)) => return Exact(NavigationTarget::from_macro_def(db, mac)),
Some(FieldAccess(field)) => return Exact(NavigationTarget::from_field(db, field)),