language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Group import data in a struct

Browse source
This commit is contained in:
Kirill Bulatov 2020-11-27 12:22:10 +02:00
parent f4ae3650d8
commit f75f07019b
5 changed files with 49 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/completion/src/render/macro_.rs
View file

@ -1,24 +1,22 @@
//! Renderer for macro invocations.
use hir::{Documentation, HasSource, ModPath};
use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
use hir::{Documentation, HasSource};
use syntax::display::macro_label;
use test_utils::mark;
use crate::{
item::{CompletionItem, CompletionItemKind, CompletionKind},
item::{CompletionItem, CompletionItemKind, CompletionKind, ImportToAdd},
render::RenderContext,
};
pub(crate) fn render_macro<'a>(
ctx: RenderContext<'a>,
// TODO kb add some object instead of a tuple?
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
import_to_add: Option<ImportToAdd>,
name: String,
macro_: hir::MacroDef,
) -> Option<CompletionItem> {
let _p = profile::span("render_macro");
MacroRender::new(ctx, name, macro_).render(import_data)
MacroRender::new(ctx, name, macro_).render(import_to_add)
}
#[derive(Debug)]
@ -40,10 +38,7 @@ impl<'a> MacroRender<'a> {
MacroRender { ctx, name, macro_, docs, bra, ket }
}
fn render(
&self,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
) -> Option<CompletionItem> {
fn render(&self, import_to_add: Option<ImportToAdd>) -> Option<CompletionItem> {
// FIXME: Currently proc-macro do not have ast-node,
// such that it does not have source
if self.macro_.is_proc_macro() {
@ -55,7 +50,7 @@ impl<'a> MacroRender<'a> {
.kind(CompletionItemKind::Macro)
.set_documentation(self.docs.clone())
.set_deprecated(self.ctx.is_deprecated(self.macro_))
.import_data(import_data)
.add_import(import_to_add)
.detail(self.detail());
let needs_bang = self.needs_bang();