language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix goto definition for type alias type parameters

Browse source 
closes https://github.com/rust-analyzer/rust-analyzer/issues/5042
This commit is contained in:
Aleksey Kladov 2020-07-11 12:45:30 +02:00
parent 3fc4916b53
commit 8c4919c9fd
3 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir/src/semantics/source_to_def.rs
View file

@ -194,6 +194,10 @@ impl SourceToDefCtx<'_, '_> {
let def = self.const_to_def(container.with_value(it))?;
DefWithBodyId::from(def).into()
},
ast::TypeAliasDef(it) => {
let def = self.type_alias_to_def(container.with_value(it))?;
def.into()
},
_ => continue,
}
};
@ -246,6 +250,7 @@ pub(crate) enum ChildContainer {
ImplId(ImplId),
EnumId(EnumId),
VariantId(VariantId),
TypeAliasId(TypeAliasId),
/// XXX: this might be the same def as, for example an `EnumId`. However,
/// here the children generic parameters, and not, eg enum variants.
GenericDefId(GenericDefId),
@ -258,6 +263,7 @@ impl_froms! {
ImplId,
EnumId,
VariantId,
TypeAliasId,
GenericDefId
}
@ -271,6 +277,7 @@ impl ChildContainer {
ChildContainer::ImplId(it) => it.child_by_source(db),
ChildContainer::EnumId(it) => it.child_by_source(db),
ChildContainer::VariantId(it) => it.child_by_source(db),
ChildContainer::TypeAliasId(_) => DynMap::default(),
ChildContainer::GenericDefId(it) => it.child_by_source(db),
}
}