language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Code review fixes

Browse source 
Co-Authored-By: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
Kirill Bulatov 2020-03-24 10:49:18 +02:00
parent 00cbe81a5b
commit f1cf1cc1ca
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_ide/src/completion/complete_record_literal.rs
View file

@ -1,6 +1,7 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use crate::completion::{CompletionContext, Completions}; use crate::completion::{CompletionContext, Completions};
use ra_syntax::SmolStr;
/// Complete fields in fields literals. /// Complete fields in fields literals.
pub(super) fn complete_record_literal(acc: &mut Completions, ctx: &CompletionContext) { pub(super) fn complete_record_literal(acc: &mut Completions, ctx: &CompletionContext) {
@ -11,7 +12,7 @@ pub(super) fn complete_record_literal(acc: &mut Completions, ctx: &CompletionCon
_ => return, _ => return,
}; };
let already_present_names: Vec<String> = ctx let already_present_names: Vec<SmolStr> = ctx
.record_lit_syntax .record_lit_syntax
.as_ref() .as_ref()
.and_then(|record_literal| record_literal.record_field_list()) .and_then(|record_literal| record_literal.record_field_list())
@ -20,13 +21,13 @@ pub(super) fn complete_record_literal(acc: &mut Completions, ctx: &CompletionCon
fields fields
.into_iter() .into_iter()
.filter_map(|field| field.name_ref()) .filter_map(|field| field.name_ref())
.map(|name_ref| name_ref.to_string()) .map(|name_ref| name_ref.text().clone())
.collect() .collect()
}) })
.unwrap_or_default(); .unwrap_or_default();
for (field, field_ty) in ty.variant_fields(ctx.db, variant) { for (field, field_ty) in ty.variant_fields(ctx.db, variant) {
if !already_present_names.contains(&field.name(ctx.db).to_string()) { if !already_present_names.contains(&SmolStr::from(field.name(ctx.db).to_string())) {
acc.add_field(ctx, field, &field_ty); acc.add_field(ctx, field, &field_ty);
} }
} }