bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide_completion/src/render/macro_.rs')
-rw-r--r--crates/ide_completion/src/render/macro_.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/crates/ide_completion/src/render/macro_.rs b/crates/ide_completion/src/render/macro_.rs
index d3b0de429c..9f848febeb 100644
--- a/crates/ide_completion/src/render/macro_.rs
+++ b/crates/ide_completion/src/render/macro_.rs
@@ -4,27 +4,21 @@ use hir::{Documentation, HirDisplay};
use ide_db::SymbolKind;
use syntax::SmolStr;
-use crate::{
- context::PathKind,
- item::{CompletionItem, ImportEdit},
- render::RenderContext,
-};
+use crate::{context::PathKind, item::CompletionItem, render::RenderContext};
pub(crate) fn render_macro(
ctx: RenderContext<'_>,
- import_to_add: Option<ImportEdit>,
name: hir::Name,
macro_: hir::Macro,
) -> CompletionItem {
let _p = profile::span("render_macro");
- render(ctx, name, macro_, import_to_add)
+ render(ctx, name, macro_)
}
fn render(
ctx @ RenderContext { completion, .. }: RenderContext<'_>,
name: hir::Name,
macro_: hir::Macro,
- import_to_add: Option<ImportEdit>,
) -> CompletionItem {
let source_range = if completion.is_immediately_after_macro_bang() {
cov_mark::hit!(completes_macro_call_if_cursor_at_bang_token);
@@ -52,12 +46,7 @@ fn render(
.set_documentation(docs)
.set_relevance(ctx.completion_relevance());
- if let Some(import_to_add) = import_to_add {
- item.add_import(import_to_add);
- }
-
let name = &*name;
-
match ctx.snippet_cap() {
Some(cap) if needs_bang && !completion.path_is_call() => {
let snippet = format!("{}!{}$0{}", name, bra, ket);
@@ -73,6 +62,9 @@ fn render(
item.insert_text(name);
}
};
+ if let Some(import_to_add) = ctx.import_to_add {
+ item.add_import(import_to_add);
+ }
item.build()
}