nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report correct original range in goto_definition

Browse Source
This commit is contained in:
Aleksey Kladov 2019-12-09 18:42:45 +01:00
parent 7ac4ea7fec
commit b683cbd93d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/ra_ide/src/goto_definition.rs
View File

@ -19,25 +19,23 @@ pub(crate) fn goto_definition(
position: FilePosition,
) -> Option<RangeInfo<Vec<NavigationTarget>>> {
let file = db.parse_or_expand(position.file_id.into())?;
let token = file.token_at_offset(position.offset).filter(|it| !it.kind().is_trivia()).next()?;
let token = descend_into_macros(db, position.file_id, token);
let original_token =
file.token_at_offset(position.offset).filter(|it| !it.kind().is_trivia()).next()?;
let token = descend_into_macros(db, position.file_id, original_token.clone());
let res = match_ast! {
let nav_targets = match_ast! {
match (token.value.parent()) {
ast::NameRef(name_ref) => {
let navs = reference_definition(db, token.with_value(&name_ref)).to_vec();
RangeInfo::new(name_ref.syntax().text_range(), navs.to_vec())
reference_definition(db, token.with_value(&name_ref)).to_vec()
},
ast::Name(name) => {
let navs = name_definition(db, token.with_value(&name))?;
RangeInfo::new(name.syntax().text_range(), navs)
name_definition(db, token.with_value(&name))?
},
_ => return None,
}
};
Some(res)
Some(RangeInfo::new(original_token.text_range(), nav_targets))
}
#[derive(Debug)]