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

fix: make goto_declaration multi-token mapping aware

Browse Source
This commit is contained in:
Anatol Ulrich
2021-10-26 19:31:49 +02:00
parent ee1d6cffbf
commit d8ed15b6a6
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ide/src/goto_declaration.rs
View File

@@ -19,7 +19,11 @@ pub(crate) fn goto_declaration(
let original_token = file let original_token = file
.token_at_offset(position.offset) .token_at_offset(position.offset)
.find(|it| matches!(it.kind(), IDENT | T![self] | T![super] | T![crate]))?; .find(|it| matches!(it.kind(), IDENT | T![self] | T![super] | T![crate]))?;
let token = sema.descend_into_macros_single(original_token.clone()); let range = original_token.text_range();
let info: Vec<NavigationTarget> = sema
.descend_into_macros(original_token)
.iter()
.filter_map(|token| {
let parent = token.parent()?; let parent = token.parent()?;
let def = match_ast! { let def = match_ast! {
match parent { match parent {
@@ -31,16 +35,19 @@ pub(crate) fn goto_declaration(
NameClass::Definition(it) => Some(it), NameClass::Definition(it) => Some(it),
_ => None _ => None
}, },
_ => None, _ => None
} }
}; };
match def? { match def? {
Definition::ModuleDef(hir::ModuleDef::Module(module)) => Some(RangeInfo::new( Definition::ModuleDef(hir::ModuleDef::Module(module)) => {
original_token.text_range(), Some(NavigationTarget::from_module_to_decl(db, module))
vec![NavigationTarget::from_module_to_decl(db, module)], }
)),
_ => None, _ => None,
} }
})
.collect();
Some(RangeInfo::new(range, info))
} }
#[cfg(test)] #[cfg(test)]