From cb3ef552e873a86e94a3792160fadb5d937a6f5f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 30 Apr 2021 11:52:31 +0300 Subject: internal: normalize name All def types in hir are unsubstituted --- crates/ide_completion/src/context.rs | 4 ++-- crates/ide_completion/src/render/enum_variant.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ide_completion') diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs index 32f81aec1..b005bd773 100644 --- a/crates/ide_completion/src/context.rs +++ b/crates/ide_completion/src/context.rs @@ -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)) diff --git a/crates/ide_completion/src/render/enum_variant.rs b/crates/ide_completion/src/render/enum_variant.rs index 832f5ced1..0c0c71134 100644 --- a/crates/ide_completion/src/render/enum_variant.rs +++ b/crates/ide_completion/src/render/enum_variant.rs @@ -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!( -- cgit v1.2.3