language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

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

@ -1,24 +1,23 @@
//! Renderer for `enum` variants.
use hir::{HasAttrs, HirDisplay, ModPath, StructKind};
use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
use itertools::Itertools;
use test_utils::mark;
use crate::{
item::{CompletionItem, CompletionItemKind, CompletionKind},
item::{CompletionItem, CompletionItemKind, CompletionKind, ImportToAdd},
render::{builder_ext::Params, RenderContext},
};
pub(crate) fn render_enum_variant<'a>(
ctx: RenderContext<'a>,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
import_to_add: Option<ImportToAdd>,
local_name: Option<String>,
variant: hir::EnumVariant,
path: Option<ModPath>,
) -> CompletionItem {
let _p = profile::span("render_enum_variant");
EnumVariantRender::new(ctx, local_name, variant, path).render(import_data)
EnumVariantRender::new(ctx, local_name, variant, path).render(import_to_add)
}
#[derive(Debug)]
@ -63,10 +62,7 @@ impl<'a> EnumVariantRender<'a> {
}
}
fn render(
self,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
) -> CompletionItem {
fn render(self, import_to_add: Option<ImportToAdd>) -> CompletionItem {
let mut builder = CompletionItem::new(
CompletionKind::Reference,
self.ctx.source_range(),
@ -75,7 +71,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)
.add_import(import_to_add)
.detail(self.detail());
if self.variant_kind == StructKind::Tuple {