language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +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

23
crates/completion/src/render.rs
View file

@ -16,8 +16,8 @@ use syntax::TextRange;
use test_utils::mark;
use crate::{
config::SnippetCap, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind,
CompletionScore,
config::SnippetCap, item::ImportToAdd, CompletionContext, CompletionItem, CompletionItemKind,
CompletionKind, CompletionScore,
};
use crate::render::{enum_variant::render_enum_variant, function::render_fn, macro_::render_macro};
@ -48,15 +48,15 @@ pub(crate) fn render_resolution<'a>(
pub(crate) fn render_resolution_with_import<'a>(
ctx: RenderContext<'a>,
import: ModPath,
import_path: ModPath,
import_scope: ImportScope,
merge_behaviour: Option<MergeBehaviour>,
resolution: &ScopeDef,
) -> Option<CompletionItem> {
let local_name = import.segments.last()?.to_string();
let local_name = import_path.segments.last()?.to_string();
Render::new(ctx).render_resolution(
local_name,
Some((import, import_scope, merge_behaviour)),
Some(ImportToAdd { import_path, import_scope, merge_behaviour }),
resolution,
)
}
@ -147,7 +147,7 @@ impl<'a> Render<'a> {
fn render_resolution(
self,
local_name: String,
import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
import_to_add: Option<ImportToAdd>,
resolution: &ScopeDef,
) -> Option<CompletionItem> {
let _p = profile::span("render_resolution");
@ -160,15 +160,16 @@ impl<'a> Render<'a> {
let kind = match resolution {
ScopeDef::ModuleDef(Function(func)) => {
let item = render_fn(self.ctx, import_data, Some(local_name), *func);
let item = render_fn(self.ctx, import_to_add, Some(local_name), *func);
return Some(item);
}
ScopeDef::ModuleDef(EnumVariant(var)) => {
let item = render_enum_variant(self.ctx, import_data, Some(local_name), *var, None);
let item =
render_enum_variant(self.ctx, import_to_add, Some(local_name), *var, None);
return Some(item);
}
ScopeDef::MacroDef(mac) => {
let item = render_macro(self.ctx, import_data, local_name, *mac);
let item = render_macro(self.ctx, import_to_add, local_name, *mac);
return item;
}
@ -193,7 +194,7 @@ impl<'a> Render<'a> {
local_name,
)
.kind(CompletionItemKind::UnresolvedReference)
.import_data(import_data)
.add_import(import_to_add)
.build();
return Some(item);
}
@ -248,7 +249,7 @@ impl<'a> Render<'a> {
let item = item
.kind(kind)
.import_data(import_data)
.add_import(import_to_add)
.set_documentation(docs)
.set_ref_match(ref_match)
.build();