1 files changed, 22 insertions, 17 deletions

diff --git a/crates/ra_assists/src/assists/auto_import.rs b/crates/ra_assists/src/assists/auto_import.rs
index 2629f00e6..2068256b0 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, ModPath};
 use ra_syntax::{
     ast::{self, AstNode},
-    SyntaxKind::USE_ITEM,
     SyntaxNode,
 };
 
@@ -33,9 +32,11 @@ pub(crate) fn auto_import<F: ImportsLocator>(
 ) -> Option<Assist> {
     let path_to_import: ast::Path = ctx.find_node_at_offset()?;
     let path_to_import_syntax = path_to_import.syntax();
-    if path_to_import_syntax.ancestors().find(|ancestor| ancestor.kind() == USE_ITEM).is_some() {
+    if path_to_import_syntax.ancestors().find_map(ast::UseItem::cast).is_some() {
         return None;
     }
+    let name_to_import =
+        path_to_import_syntax.descendants().find_map(ast::NameRef::cast)?.syntax().to_string();
 
     let module = path_to_import_syntax.ancestors().find_map(ast::Module::cast);
     let position = match module.and_then(|it| it.item_list()) {
@@ -52,7 +53,7 @@ pub(crate) fn auto_import<F: ImportsLocator>(
     }
 
     let proposed_imports = imports_locator
-        .find_imports(&path_to_import_syntax.to_string())
+        .find_imports(&name_to_import)
         .into_iter()
         .filter_map(|module_def| module_with_name_to_import.find_use_path(ctx.db, module_def))
         .filter(|use_path| !use_path.segments.is_empty())
@@ -62,16 +63,12 @@ pub(crate) fn auto_import<F: ImportsLocator>(
         return None;
     }
 
-    ctx.add_assist_group(
-        AssistId("auto_import"),
-        format!("Import {}", path_to_import_syntax),
-        || {
-            proposed_imports
-                .into_iter()
-                .map(|import| import_to_action(import, &position, &path_to_import_syntax))
-                .collect()
-        },
-    )
+    ctx.add_assist_group(AssistId("auto_import"), format!("Import {}", name_to_import), || {
+        proposed_imports
+            .into_iter()
+            .map(|import| import_to_action(import, &position, &path_to_import_syntax))
+            .collect()
+    })
 }
 
 fn import_to_action(import: ModPath, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
@@ -121,21 +118,29 @@ mod tests {
             r"
             use PubMod::PubStruct1;
 
-            PubStruct2<|>
+            struct Test {
+                test: Pub<|>Struct2<u8>,
+            }
 
             pub mod PubMod {
                 pub struct PubStruct1;
-                pub struct PubStruct2;
+                pub struct PubStruct2<T> {
+                    _t: T,
+                }
             }
             ",
             r"
             use PubMod::{PubStruct2, PubStruct1};
 
-            PubStruct2<|>
+            struct Test {
+                test: Pub<|>Struct2<u8>,
+            }
 
             pub mod PubMod {
                 pub struct PubStruct1;
-                pub struct PubStruct2;
+                pub struct PubStruct2<T> {
+                    _t: T,
+                }
             }
             ",
         );