diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2022-03-16 16:41:35 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2022-03-16 16:41:35 +0100 |
| commit | a40a847d77833e01bf8227f06c149f2e22a27935 (patch) | |
| tree | 03f8ce8d7276bb65a34ce3557e590c7439acd22d | |
| parent | c1f6f135e1f9ec056e930394a4838aa63fd17b96 (diff) | |
| download | rust-a40a847d77833e01bf8227f06c149f2e22a27935.tar.gz rust-a40a847d77833e01bf8227f06c149f2e22a27935.zip | |
Revert omitting field completions
| -rw-r--r-- | crates/ide_completion/src/completions.rs | 5 | ||||
| -rw-r--r-- | crates/ide_completion/src/render/pattern.rs | 7 | ||||
| -rw-r--r-- | crates/ide_completion/src/tests/pattern.rs | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/crates/ide_completion/src/completions.rs b/crates/ide_completion/src/completions.rs index d187d56cb55..867e6bcf48d 100644 --- a/crates/ide_completion/src/completions.rs +++ b/crates/ide_completion/src/completions.rs @@ -319,9 +319,7 @@ impl Completions { variant, local_name.clone(), None, - false, )); - self.add_opt(render_variant_pat(RenderContext::new(ctx), variant, local_name, None, true)); } pub(crate) fn add_qualified_variant_pat( @@ -331,8 +329,7 @@ impl Completions { path: hir::ModPath, ) { let path = Some(&path); - self.add_opt(render_variant_pat(RenderContext::new(ctx), variant, None, path, false)); - self.add_opt(render_variant_pat(RenderContext::new(ctx), variant, None, path, true)); + self.add_opt(render_variant_pat(RenderContext::new(ctx), variant, None, path)); } pub(crate) fn add_struct_pat( diff --git a/crates/ide_completion/src/render/pattern.rs b/crates/ide_completion/src/render/pattern.rs index b47be68e074..efceb85718d 100644 --- a/crates/ide_completion/src/render/pattern.rs +++ b/crates/ide_completion/src/render/pattern.rs @@ -37,16 +37,11 @@ pub(crate) fn render_variant_pat( variant: hir::Variant, local_name: Option<Name>, path: Option<&hir::ModPath>, - omit_fields: bool, ) -> Option<CompletionItem> { let _p = profile::span("render_variant_pat"); let fields = variant.fields(ctx.db()); - let (visible_fields, fields_omitted) = if omit_fields { - (Vec::new(), false) - } else { - visible_fields(ctx.completion, &fields, variant)? - }; + let (visible_fields, fields_omitted) = visible_fields(ctx.completion, &fields, variant)?; let name = match path { Some(path) => path.to_string().into(), diff --git a/crates/ide_completion/src/tests/pattern.rs b/crates/ide_completion/src/tests/pattern.rs index aa8cb36f040..50d5e01979b 100644 --- a/crates/ide_completion/src/tests/pattern.rs +++ b/crates/ide_completion/src/tests/pattern.rs @@ -124,7 +124,6 @@ fn foo() { st Unit ma makro!(…) macro_rules! makro bn TupleV TupleV($1)$0 - bn TupleV TupleV()$0 ev TupleV ct CONST "#]], |