From 99c4a41cd1a9f9ef0ee4f067f0069a23123b949a Mon Sep 17 00:00:00 2001 From: yonip23 Date: Thu, 11 Mar 2021 17:46:41 +0200 Subject: use references in CompletionItem's builder --- crates/ide_completion/src/render/macro_.rs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'crates/ide_completion/src/render/macro_.rs') diff --git a/crates/ide_completion/src/render/macro_.rs b/crates/ide_completion/src/render/macro_.rs index a6cf3e479..727f5e02e 100644 --- a/crates/ide_completion/src/render/macro_.rs +++ b/crates/ide_completion/src/render/macro_.rs @@ -40,24 +40,27 @@ impl<'a> MacroRender<'a> { fn render(&self, import_to_add: Option) -> Option { let mut builder = - CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), &self.label()) - .kind(SymbolKind::Macro) - .set_documentation(self.docs.clone()) - .set_deprecated(self.ctx.is_deprecated(self.macro_)) - .add_import(import_to_add) - .set_detail(self.detail()); + CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), &self.label()); + builder + .kind(SymbolKind::Macro) + .set_documentation(self.docs.clone()) + .set_deprecated(self.ctx.is_deprecated(self.macro_)) + .add_import(import_to_add) + .set_detail(self.detail()); let needs_bang = self.needs_bang(); - builder = match self.ctx.snippet_cap() { + match self.ctx.snippet_cap() { Some(cap) if needs_bang => { let snippet = self.snippet(); let lookup = self.lookup(); - builder.insert_snippet(cap, snippet).lookup_by(lookup) + builder.insert_snippet(cap, snippet).lookup_by(lookup); + } + None if needs_bang => { + builder.insert_text(self.banged_name()); } - None if needs_bang => builder.insert_text(self.banged_name()), _ => { cov_mark::hit!(dont_insert_macro_call_parens_unncessary); - builder.insert_text(&self.name) + builder.insert_text(&self.name); } }; -- cgit v1.2.3