From dcd415742095e0d21ce9c4b774ed3433858bf11a Mon Sep 17 00:00:00 2001
From: "nathan.whitaker" <nathan.whitaker01@gmail.com>
Date: Sun, 29 Aug 2021 13:12:59 -0400
Subject: [PATCH 1/4] Use struct init shorthand in fill struct fields assist

---
 .../src/handlers/missing_fields.rs            | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/crates/ide_diagnostics/src/handlers/missing_fields.rs b/crates/ide_diagnostics/src/handlers/missing_fields.rs
index bc56e03428..616f49a3fa 100644
--- a/crates/ide_diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide_diagnostics/src/handlers/missing_fields.rs
@@ -1,6 +1,7 @@
 use either::Either;
 use hir::{db::AstDatabase, InFile};
 use ide_db::{assists::Assist, source_change::SourceChange};
+use rustc_hash::FxHashMap;
 use stdx::format_to;
 use syntax::{algo, ast::make, AstNode, SyntaxNodePtr};
 use text_edit::TextEdit;
@@ -54,9 +55,26 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Ass
     };
     let old_field_list = field_list_parent.record_expr_field_list()?;
     let new_field_list = old_field_list.clone_for_update();
-    for f in d.missed_fields.iter() {
+    let mut locals = FxHashMap::default();
+    ctx.sema.scope(field_list_parent.syntax()).process_all_names(&mut |name, def| {
+        if let hir::ScopeDef::Local(local) = def {
+            locals.insert(name.clone(), local);
+        }
+    });
+    let missing_fields = ctx.sema.record_literal_missing_fields(&field_list_parent);
+    for (f, ty) in missing_fields.iter() {
+        let field_expr = if let Some(local_candidate) = locals.get(&f.name(ctx.sema.db)) {
+            let candidate_ty = local_candidate.ty(ctx.sema.db);
+            if ty.could_unify_with(ctx.sema.db, &candidate_ty) {
+                None
+            } else {
+                Some(make::expr_unit())
+            }
+        } else {
+            Some(make::expr_unit())
+        };
         let field =
-            make::record_expr_field(make::name_ref(&f.to_string()), Some(make::expr_unit()))
+            make::record_expr_field(make::name_ref(&f.name(ctx.sema.db).to_string()), field_expr)
                 .clone_for_update();
         new_field_list.add_field(field);
     }

From 251f9dfc8ae5475cc1276545d1e46e59f13a4b84 Mon Sep 17 00:00:00 2001
From: "nathan.whitaker" <nathan.whitaker01@gmail.com>
Date: Sun, 29 Aug 2021 13:14:03 -0400
Subject: [PATCH 2/4] Add tests for fill struct fields shorthand

---
 .../src/handlers/missing_fields.rs            | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/crates/ide_diagnostics/src/handlers/missing_fields.rs b/crates/ide_diagnostics/src/handlers/missing_fields.rs
index 616f49a3fa..d15da23c4a 100644
--- a/crates/ide_diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide_diagnostics/src/handlers/missing_fields.rs
@@ -342,6 +342,93 @@ fn f() {
         );
     }
 
+    #[test]
+    fn test_fill_struct_fields_shorthand() {
+        check_fix(
+            r#"
+struct S { a: &'static str, b: i32 }
+
+fn f() {
+    let a = "hello";
+    let b = 1i32;
+    S {
+        $0
+    };
+}
+"#,
+            r#"
+struct S { a: &'static str, b: i32 }
+
+fn f() {
+    let a = "hello";
+    let b = 1i32;
+    S {
+        a,
+        b,
+    };
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn test_fill_struct_fields_shorthand_ty_mismatch() {
+        check_fix(
+            r#"
+struct S { a: &'static str, b: i32 }
+
+fn f() {
+    let a = "hello";
+    let b = 1usize;
+    S {
+        $0
+    };
+}
+"#,
+            r#"
+struct S { a: &'static str, b: i32 }
+
+fn f() {
+    let a = "hello";
+    let b = 1usize;
+    S {
+        a,
+        b: (),
+    };
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn test_fill_struct_fields_shorthand_unifies() {
+        check_fix(
+            r#"
+struct S<T> { a: &'static str, b: T }
+
+fn f() {
+    let a = "hello";
+    let b = 1i32;
+    S {
+        $0
+    };
+}
+"#,
+            r#"
+struct S<T> { a: &'static str, b: T }
+
+fn f() {
+    let a = "hello";
+    let b = 1i32;
+    S {
+        a,
+        b,
+    };
+}
+"#,
+        );
+    }
+
     #[test]
     fn import_extern_crate_clash_with_inner_item() {
         // This is more of a resolver test, but doesn't really work with the hir_def testsuite.

From e4757f94072e0d5d24107a73f5e5afad15f707cb Mon Sep 17 00:00:00 2001
From: "nathan.whitaker" <nathan.whitaker01@gmail.com>
Date: Sun, 29 Aug 2021 13:14:15 -0400
Subject: [PATCH 3/4] Update existing fill struct fields test

---
 crates/ide_diagnostics/src/handlers/missing_fields.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide_diagnostics/src/handlers/missing_fields.rs b/crates/ide_diagnostics/src/handlers/missing_fields.rs
index d15da23c4a..cc0b998068 100644
--- a/crates/ide_diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide_diagnostics/src/handlers/missing_fields.rs
@@ -242,7 +242,7 @@ enum Expr {
 
 impl Expr {
     fn new_bin(lhs: Box<Expr>, rhs: Box<Expr>) -> Expr {
-        Expr::Bin { lhs: (), rhs: () }
+        Expr::Bin { lhs, rhs }
     }
 }
 "#,

From e1d86a42fee92f261956b12cb2310f1e5904dacf Mon Sep 17 00:00:00 2001
From: "nathan.whitaker" <nathan.whitaker01@gmail.com>
Date: Mon, 30 Aug 2021 14:37:03 -0400
Subject: [PATCH 4/4] Add coverage mark for struct init shorthand test

---
 crates/ide_diagnostics/src/handlers/missing_fields.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/ide_diagnostics/src/handlers/missing_fields.rs b/crates/ide_diagnostics/src/handlers/missing_fields.rs
index cc0b998068..f61ab1f410 100644
--- a/crates/ide_diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide_diagnostics/src/handlers/missing_fields.rs
@@ -64,6 +64,7 @@ fn fixes(ctx: &DiagnosticsContext<'_>, d: &hir::MissingFields) -> Option<Vec<Ass
     let missing_fields = ctx.sema.record_literal_missing_fields(&field_list_parent);
     for (f, ty) in missing_fields.iter() {
         let field_expr = if let Some(local_candidate) = locals.get(&f.name(ctx.sema.db)) {
+            cov_mark::hit!(field_shorthand);
             let candidate_ty = local_candidate.ty(ctx.sema.db);
             if ty.could_unify_with(ctx.sema.db, &candidate_ty) {
                 None
@@ -344,6 +345,7 @@ fn f() {
 
     #[test]
     fn test_fill_struct_fields_shorthand() {
+        cov_mark::check!(field_shorthand);
         check_fix(
             r#"
 struct S { a: &'static str, b: i32 }