2 files changed, 30 insertions, 4 deletions

diff --git a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
index c1124b9e2..8ac20210a 100644
--- a/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -1,6 +1,7 @@
 use base_db::FileId;
 use hir::{EnumVariant, Module, ModuleDef, Name};
 use ide_db::{defs::Definition, search::Reference, RootDatabase};
+use itertools::Itertools;
 use rustc_hash::FxHashSet;
 use syntax::{
     algo::find_node_at_offset,
@@ -203,13 +204,11 @@ fn list_with_visibility(list: &str) -> String {
             mod_part.insert_str(index, "pub ");
             mod_part
         })
-        .collect::<Vec<String>>()
         .join(", ")
 }
 
 #[cfg(test)]
 mod tests {
-
     use crate::{
         tests::{check_assist, check_assist_not_applicable},
         utils::FamousDefs,
diff --git a/crates/assists/src/handlers/inline_local_variable.rs b/crates/assists/src/handlers/inline_local_variable.rs
index 164bbce86..587eb5feb 100644
--- a/crates/assists/src/handlers/inline_local_variable.rs
+++ b/crates/assists/src/handlers/inline_local_variable.rs
@@ -1,4 +1,4 @@
-use ide_db::defs::Definition;
+use ide_db::{defs::Definition, search::ReferenceKind};
 use syntax::{
     ast::{self, AstNode, AstToken},
     TextRange,
@@ -119,7 +119,13 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
             for (desc, should_wrap) in refs.iter().zip(wrap_in_parens) {
                 let replacement =
                     if should_wrap { init_in_paren.clone() } else { init_str.clone() };
-                builder.replace(desc.file_range.range, replacement)
+                match desc.kind {
+                    ReferenceKind::FieldShorthandForLocal => {
+                        mark::hit!(inline_field_shorthand);
+                        builder.insert(desc.file_range.range.end(), format!(": {}", replacement))
+                    }
+                    _ => builder.replace(desc.file_range.range, replacement),
+                }
             }
         },
     )
@@ -667,6 +673,27 @@ fn foo() {
     }
 
     #[test]
+    fn inline_field_shorthand() {
+        mark::check!(inline_field_shorthand);
+        check_assist(
+            inline_local_variable,
+            r"
+struct S { foo: i32}
+fn main() {
+    let <|>foo = 92;
+    S { foo }
+}
+",
+            r"
+struct S { foo: i32}
+fn main() {
+    S { foo: 92 }
+}
+",
+        );
+    }
+
+    #[test]
     fn test_not_applicable_if_variable_unused() {
         mark::check!(test_not_applicable_if_variable_unused);
         check_assist_not_applicable(