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

internal: normalize name

Browse source 
All def types in hir are unsubstituted
This commit is contained in:
Aleksey Kladov 2021-04-30 11:52:31 +03:00
parent 49b219b103
commit cb3ef552e8
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide_completion/src/context.rs
View file

@ -347,7 +347,7 @@ impl<'a> CompletionContext<'a> {
.and_then(|node| ast::RecordExprField::cast(node))
.and_then(|rf| self.sema.resolve_record_field(&rf).zip(Some(rf)))
.map(|(f, rf)|(
Some(f.0.signature_ty(self.db)),
Some(f.0.ty(self.db)),
rf.field_name().map(NameOrNameRef::NameRef),
))
.unwrap_or((None, None))
@ -357,7 +357,7 @@ impl<'a> CompletionContext<'a> {
self.sema
.resolve_record_field(&it)
.map(|f|(
Some(f.0.signature_ty(self.db)),
Some(f.0.ty(self.db)),
it.field_name().map(NameOrNameRef::NameRef),
))
.unwrap_or((None, None))

2
crates/ide_completion/src/render/enum_variant.rs
View file

@ -93,7 +93,7 @@ impl<'a> EnumRender<'a> {
.variant
.fields(self.ctx.db())
.into_iter()
.map(|field| (field.name(self.ctx.db()), field.signature_ty(self.ctx.db())));
.map(|field| (field.name(self.ctx.db()), field.ty(self.ctx.db())));
match self.variant_kind {
StructKind::Tuple | StructKind::Unit => format!(