2 files changed, 36 insertions, 15 deletions

diff --git a/crates/ra_assists/src/assists/add_import.rs b/crates/ra_assists/src/assists/add_import.rs
index bf6cfe865..fc038df78 100644
--- a/crates/ra_assists/src/assists/add_import.rs
+++ b/crates/ra_assists/src/assists/add_import.rs
@@ -1,4 +1,4 @@
-use hir::{self, db::HirDatabase};
+use hir::{self, db::HirDatabase, ModPath};
 use ra_syntax::{
     ast::{self, NameOwner},
     AstNode, Direction, SmolStr,
@@ -20,10 +20,10 @@ pub fn auto_import_text_edit(
     position: &SyntaxNode,
     // The statement to use as anchor (last resort)
     anchor: &SyntaxNode,
-    // The path to import as a sequence of strings
-    target: &[SmolStr],
+    path_to_import: &ModPath,
     edit: &mut TextEditBuilder,
 ) {
+    let target = path_to_import.to_string().split("::").map(SmolStr::new).collect::<Vec<_>>();
     let container = position.ancestors().find_map(|n| {
         if let Some(module) = ast::Module::cast(n.clone()) {
             return module.item_list().map(|it| it.syntax().clone());
@@ -32,8 +32,8 @@ pub fn auto_import_text_edit(
     });
 
     if let Some(container) = container {
-        let action = best_action_for_target(container, anchor.clone(), target);
-        make_assist(&action, target, edit);
+        let action = best_action_for_target(container, anchor.clone(), &target);
+        make_assist(&action, &target, edit);
     }
 }
 
diff --git a/crates/ra_assists/src/assists/auto_import.rs b/crates/ra_assists/src/assists/auto_import.rs
index 8c483e2da..2629f00e6 100644
--- a/crates/ra_assists/src/assists/auto_import.rs
+++ b/crates/ra_assists/src/assists/auto_import.rs
@@ -1,7 +1,6 @@
-use hir::db::HirDatabase;
+use hir::{db::HirDatabase, ModPath};
 use ra_syntax::{
     ast::{self, AstNode},
-    SmolStr,
     SyntaxKind::USE_ITEM,
     SyntaxNode,
 };
@@ -58,7 +57,6 @@ pub(crate) fn auto_import<F: ImportsLocator>(
         .filter_map(|module_def| module_with_name_to_import.find_use_path(ctx.db, module_def))
         .filter(|use_path| !use_path.segments.is_empty())
         .take(20)
-        .map(|import| import.to_string())
         .collect::<std::collections::BTreeSet<_>>();
     if proposed_imports.is_empty() {
         return None;
@@ -76,15 +74,10 @@ pub(crate) fn auto_import<F: ImportsLocator>(
     )
 }
 
-fn import_to_action(import: String, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
+fn import_to_action(import: ModPath, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
     let mut action_builder = ActionBuilder::default();
     action_builder.label(format!("Import `{}`", &import));
-    auto_import_text_edit(
-        position,
-        anchor,
-        &[SmolStr::new(import)],
-        action_builder.text_edit_builder(),
-    );
+    auto_import_text_edit(position, anchor, &import, action_builder.text_edit_builder());
     action_builder
 }
 
@@ -121,6 +114,34 @@ mod tests {
     }
 
     #[test]
+    fn auto_imports_are_merged() {
+        check_assist_with_imports_locator(
+            auto_import,
+            TestImportsLocator::new,
+            r"
+            use PubMod::PubStruct1;
+
+            PubStruct2<|>
+
+            pub mod PubMod {
+                pub struct PubStruct1;
+                pub struct PubStruct2;
+            }
+            ",
+            r"
+            use PubMod::{PubStruct2, PubStruct1};
+
+            PubStruct2<|>
+
+            pub mod PubMod {
+                pub struct PubStruct1;
+                pub struct PubStruct2;
+            }
+            ",
+        );
+    }
+
+    #[test]
     fn applicable_when_found_multiple_imports() {
         check_assist_with_imports_locator(
             auto_import,