language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid turning completion objects into builders

Browse source
This commit is contained in:
Kirill Bulatov 2020-11-16 23:16:41 +02:00
parent 4109968934
commit d4128beb3d
9 changed files with 117 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/completion/src/render/enum_variant.rs
View file

@ -1,5 +1,6 @@
//! Renderer for `enum` variants.
use assists::utils::{ImportScope, MergeBehaviour};
use hir::{HasAttrs, HirDisplay, ModPath, StructKind};
use itertools::Itertools;
use test_utils::mark;
@ -11,11 +12,12 @@ use crate::{
pub(crate) fn render_enum_variant<'a>(
ctx: RenderContext<'a>,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
local_name: Option<String>,
variant: hir::EnumVariant,
path: Option<ModPath>,
) -> CompletionItem {
EnumVariantRender::new(ctx, local_name, variant, path).render()
EnumVariantRender::new(ctx, local_name, variant, path).render(import_data)
}
#[derive(Debug)]
@ -60,7 +62,10 @@ impl<'a> EnumVariantRender<'a> {
}
}
fn render(self) -> CompletionItem {
fn render(
self,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
) -> CompletionItem {
let mut builder = CompletionItem::new(
CompletionKind::Reference,
self.ctx.source_range(),
@ -69,6 +74,7 @@ impl<'a> EnumVariantRender<'a> {
.kind(CompletionItemKind::EnumVariant)
.set_documentation(self.variant.docs(self.ctx.db()))
.set_deprecated(self.ctx.is_deprecated(self.variant))
.import_data(import_data)
.detail(self.detail());
if self.variant_kind == StructKind::Tuple {