Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide_assists/src/handlers/auto_import.rs')
| -rw-r--r-- | crates/ide_assists/src/handlers/auto_import.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ide_assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs index 1ec3932a2d..c877748246 100644 --- a/crates/ide_assists/src/handlers/auto_import.rs +++ b/crates/ide_assists/src/handlers/auto_import.rs @@ -3,7 +3,7 @@ use ide_db::helpers::{ insert_use::{insert_use, ImportScope}, mod_path_to_ast, }; -use syntax::{ast, AstNode, SyntaxNode}; +use syntax::{ast, AstNode, AstToken, SyntaxNode}; use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; @@ -128,9 +128,10 @@ pub(super) fn find_importable_node(ctx: &AssistContext) -> Option<(ImportAssets, .find_node_at_offset_with_descend::<ast::IdentPat>() .filter(ast::IdentPat::is_simple_ident) { - ImportAssets::for_ident_pat(&pat, &ctx.sema).zip(Some(pat.syntax().clone())) + ImportAssets::for_ident_pat(&ctx.sema, &pat).zip(Some(pat.syntax().clone())) } else { - None + let ident = ctx.find_token_at_offset()?; + ImportAssets::for_derive_ident(&ctx.sema, &ident).zip(ident.syntax().parent()) } } |