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

Merge #10637

Browse Source 
10637: fix: make `goto_type_definition` multi-token mapping aware r=Veykril a=spookyvision



Co-authored-by: Anatol Ulrich <anatol.ulrich@ferrous-systems.com>
This commit is contained in:
bors[bot] 2021-10-26 10:46:33 +00:00 committed by GitHub
commit ee1d6cffbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
crates/ide/src/goto_type_definition.rs
View File

@ -27,32 +27,6 @@ pub(crate) fn goto_type_definition(
kind if kind.is_trivia() => 0, kind if kind.is_trivia() => 0,
_ => 1, _ => 1,
})?; })?;
let token: SyntaxToken = sema.descend_into_macros_single(token);
let (ty, node) = sema.token_ancestors_with_macros(token).find_map(|node| {
let ty = match_ast! {
match node {
ast::Expr(it) => sema.type_of_expr(&it)?.original,
ast::Pat(it) => sema.type_of_pat(&it)?.original,
ast::SelfParam(it) => sema.type_of_self(&it)?,
ast::Type(it) => sema.resolve_type(&it)?,
ast::RecordField(it) => sema.to_def(&it).map(|d| d.ty(db.upcast()))?,
// can't match on RecordExprField directly as `ast::Expr` will match an iteration too early otherwise
ast::NameRef(it) => {
if let Some(record_field) = ast::RecordExprField::for_name_ref(&it) {
let (_, _, ty) = sema.resolve_record_field(&record_field)?;
ty
} else {
let record_field = ast::RecordPatField::for_field_name_ref(&it)?;
sema.resolve_record_pat_field(&record_field)?.ty(db)
}
},
_ => return None,
}
};
Some((ty, node))
})?;
let mut res = Vec::new(); let mut res = Vec::new();
let mut push = |def: hir::ModuleDef| { let mut push = |def: hir::ModuleDef| {
@ -62,21 +36,56 @@ pub(crate) fn goto_type_definition(
} }
} }
}; };
let range = token.text_range();
sema.descend_into_macros(token)
.iter()
.filter_map(|token| {
let ty = sema.token_ancestors_with_macros(token.clone()).find_map(|node| {
let ty = match_ast! {
match node {
ast::Expr(it) => sema.type_of_expr(&it)?.original,
ast::Pat(it) => sema.type_of_pat(&it)?.original,
ast::SelfParam(it) => sema.type_of_self(&it)?,
ast::Type(it) => sema.resolve_type(&it)?,
ast::RecordField(it) => sema.to_def(&it).map(|d| d.ty(db.upcast()))?,
// can't match on RecordExprField directly as `ast::Expr` will match an iteration too early otherwise
ast::NameRef(it) => {
if let Some(record_field) = ast::RecordExprField::for_name_ref(&it) {
let (_, _, ty) = sema.resolve_record_field(&record_field)?;
ty
} else {
let record_field = ast::RecordPatField::for_field_name_ref(&it)?;
sema.resolve_record_pat_field(&record_field)?.ty(db)
}
},
_ => return None,
}
};
let ty = ty.strip_references(); Some(ty)
ty.walk(db, |t| { });
if let Some(adt) = t.as_adt() { ty
push(adt.into()); })
} else if let Some(trait_) = t.as_dyn_trait() { .for_each(|ty| {
push(trait_.into()); // collect from each `ty` into the `res` result vec
} else if let Some(traits) = t.as_impl_traits(db) { let ty = ty.strip_references();
traits.into_iter().for_each(|it| push(it.into())); ty.walk(db, |t| {
} else if let Some(trait_) = t.as_associated_type_parent_trait(db) { if let Some(adt) = t.as_adt() {
push(trait_.into()); push(adt.into());
} } else if let Some(trait_) = t.as_dyn_trait() {
}); push(trait_.into());
} else if let Some(traits) = t.as_impl_traits(db) {
Some(RangeInfo::new(node.text_range(), res)) traits.into_iter().for_each(|it| push(it.into()));
} else if let Some(trait_) = t.as_associated_type_parent_trait(db) {
push(trait_.into());
}
});
});
if res.is_empty() {
None
} else {
Some(RangeInfo::new(range, res))
}
} }
#[cfg(test)] #[cfg(test)]