Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide_completion/src/completions/attribute/derive.rs')
| -rw-r--r-- | crates/ide_completion/src/completions/attribute/derive.rs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/crates/ide_completion/src/completions/attribute/derive.rs b/crates/ide_completion/src/completions/attribute/derive.rs index b9032318ec..0daf114788 100644 --- a/crates/ide_completion/src/completions/attribute/derive.rs +++ b/crates/ide_completion/src/completions/attribute/derive.rs @@ -1,15 +1,16 @@ //! Completion for derives use hir::{HasAttrs, MacroDef, MacroKind}; -use ide_db::helpers::{import_assets::ImportAssets, insert_use::ImportScope, FamousDefs}; +use ide_db::{ + helpers::{import_assets::ImportAssets, insert_use::ImportScope, FamousDefs}, + SymbolKind, +}; use itertools::Itertools; use rustc_hash::FxHashSet; use syntax::{ast, SmolStr, SyntaxKind}; use crate::{ - completions::flyimport::compute_fuzzy_completion_order_key, - context::CompletionContext, - item::{CompletionItem, CompletionItemKind}, - Completions, ImportEdit, + completions::flyimport::compute_fuzzy_completion_order_key, context::CompletionContext, + item::CompletionItem, Completions, ImportEdit, }; pub(super) fn complete_derive( @@ -56,8 +57,7 @@ pub(super) fn complete_derive( _ => (name, None), }; - let mut item = - CompletionItem::new(CompletionItemKind::Attribute, ctx.source_range(), label); + let mut item = CompletionItem::new(SymbolKind::Derive, ctx.source_range(), label); if let Some(docs) = mac.docs(ctx.db) { item.documentation(docs); } @@ -67,7 +67,7 @@ pub(super) fn complete_derive( item.add_to(acc); } - flyimport_attribute(acc, ctx); + flyimport_derive(acc, ctx); } fn get_derives_in_scope(ctx: &CompletionContext) -> Vec<(hir::Name, MacroDef)> { @@ -82,7 +82,7 @@ fn get_derives_in_scope(ctx: &CompletionContext) -> Vec<(hir::Name, MacroDef)> { result } -fn flyimport_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { +fn flyimport_derive(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { if ctx.token.kind() != SyntaxKind::IDENT { return None; }; @@ -106,13 +106,14 @@ fn flyimport_attribute(acc: &mut Completions, ctx: &CompletionContext) -> Option hir::ItemInNs::Macros(mac) => Some((import, mac)), _ => None, }) + .filter(|&(_, mac)| mac.kind() == MacroKind::Derive) .filter(|&(_, mac)| !ctx.is_item_hidden(&hir::ItemInNs::Macros(mac))) .sorted_by_key(|(import, _)| { compute_fuzzy_completion_order_key(&import.import_path, &user_input_lowercased) }) .filter_map(|(import, mac)| { let mut item = CompletionItem::new( - CompletionItemKind::Attribute, + SymbolKind::Derive, ctx.source_range(), mac.name(ctx.db)?.to_smol_str(), ); |