Unite record completion logic into a single module

1 files changed, 2 insertions, 64 deletions

diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs
index 67dfd6f2e..93157bbba 100644
--- a/crates/ra_ide/src/completion.rs
+++ b/crates/ra_ide/src/completion.rs
@@ -5,8 +5,7 @@ mod completion_context;
 mod presentation;
 
 mod complete_dot;
-mod complete_record_literal;
-mod complete_record_pattern;
+mod complete_record;
 mod complete_pattern;
 mod complete_fn_param;
 mod complete_keyword;
@@ -32,12 +31,6 @@ use crate::{
 pub use crate::completion::completion_item::{
     CompletionItem, CompletionItemKind, InsertTextFormat,
 };
-use either::Either;
-use hir::{StructField, Type};
-use ra_syntax::{
-    ast::{self, NameOwner},
-    SmolStr,
-};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CompletionConfig {
@@ -95,8 +88,7 @@ pub(crate) fn completions(
     complete_path::complete_path(&mut acc, &ctx);
     complete_scope::complete_scope(&mut acc, &ctx);
     complete_dot::complete_dot(&mut acc, &ctx);
-    complete_record_literal::complete_record_literal(&mut acc, &ctx);
-    complete_record_pattern::complete_record_pattern(&mut acc, &ctx);
+    complete_record::complete_record(&mut acc, &ctx);
     complete_pattern::complete_pattern(&mut acc, &ctx);
     complete_postfix::complete_postfix(&mut acc, &ctx);
     complete_macro_in_item_position::complete_macro_in_item_position(&mut acc, &ctx);
@@ -104,57 +96,3 @@ pub(crate) fn completions(
 
     Some(acc)
 }
-
-pub(crate) fn get_missing_fields(
-    ctx: &CompletionContext,
-    record: Either<&ast::RecordLit, &ast::RecordPat>,
-) -> Option<Vec<(StructField, Type)>> {
-    let (ty, variant) = match record {
-        Either::Left(record_lit) => (
-            ctx.sema.type_of_expr(&record_lit.clone().into())?,
-            ctx.sema.resolve_record_literal(record_lit)?,
-        ),
-        Either::Right(record_pat) => (
-            ctx.sema.type_of_pat(&record_pat.clone().into())?,
-            ctx.sema.resolve_record_pattern(record_pat)?,
-        ),
-    };
-
-    let already_present_names = get_already_present_names(record);
-    Some(
-        ty.variant_fields(ctx.db, variant)
-            .into_iter()
-            .filter(|(field, _)| {
-                !already_present_names.contains(&SmolStr::from(field.name(ctx.db).to_string()))
-            })
-            .collect(),
-    )
-}
-
-fn get_already_present_names(record: Either<&ast::RecordLit, &ast::RecordPat>) -> Vec<SmolStr> {
-    // TODO kb have a single match
-    match record {
-        Either::Left(record_lit) => record_lit
-            .record_field_list()
-            .map(|field_list| field_list.fields())
-            .map(|fields| {
-                fields
-                    .into_iter()
-                    .filter_map(|field| field.name_ref())
-                    .map(|name_ref| name_ref.text().clone())
-                    .collect()
-            })
-            .unwrap_or_default(),
-        Either::Right(record_pat) => record_pat
-            .record_field_pat_list()
-            .map(|pat_list| pat_list.bind_pats())
-            .map(|bind_pats| {
-                bind_pats
-                    .into_iter()
-                    .filter_map(|pat| pat.name())
-                    .map(|name| name.text().clone())
-                    .collect()
-            })
-            .unwrap_or_default(),
-    }
-}