aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/completion/src/item.rs31
-rw-r--r--crates/completion/src/render.rs23
-rw-r--r--crates/completion/src/render/enum_variant.rs14
-rw-r--r--crates/completion/src/render/function.rs16
-rw-r--r--crates/completion/src/render/macro_.rs17
5 files changed, 49 insertions, 52 deletions
diff --git a/crates/completion/src/item.rs b/crates/completion/src/item.rs
index 675cef8c4..3bfee1b3f 100644
--- a/crates/completion/src/item.rs
+++ b/crates/completion/src/item.rs
@@ -204,7 +204,7 @@ impl CompletionItem {
204 trigger_call_info: None, 204 trigger_call_info: None,
205 score: None, 205 score: None,
206 ref_match: None, 206 ref_match: None,
207 import_data: None, 207 import_to_add: None,
208 } 208 }
209 } 209 }
210 210
@@ -258,13 +258,21 @@ impl CompletionItem {
258 } 258 }
259} 259}
260 260
261/// An extra import to add after the completion is applied.
262#[derive(Clone)]
263pub(crate) struct ImportToAdd {
264 pub(crate) import_path: ModPath,
265 pub(crate) import_scope: ImportScope,
266 pub(crate) merge_behaviour: Option<MergeBehaviour>,
267}
268
261/// A helper to make `CompletionItem`s. 269/// A helper to make `CompletionItem`s.
262#[must_use] 270#[must_use]
263#[derive(Clone)] 271#[derive(Clone)]
264pub(crate) struct Builder { 272pub(crate) struct Builder {
265 source_range: TextRange, 273 source_range: TextRange,
266 completion_kind: CompletionKind, 274 completion_kind: CompletionKind,
267 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>, 275 import_to_add: Option<ImportToAdd>,
268 label: String, 276 label: String,
269 insert_text: Option<String>, 277 insert_text: Option<String>,
270 insert_text_format: InsertTextFormat, 278 insert_text_format: InsertTextFormat,
@@ -288,9 +296,9 @@ impl Builder {
288 let mut insert_text = self.insert_text; 296 let mut insert_text = self.insert_text;
289 let mut text_edits = TextEdit::builder(); 297 let mut text_edits = TextEdit::builder();
290 298
291 if let Some((import_path, import_scope, merge_behaviour)) = self.import_data { 299 if let Some(import_data) = self.import_to_add {
292 let import = mod_path_to_ast(&import_path); 300 let import = mod_path_to_ast(&import_data.import_path);
293 let mut import_path_without_last_segment = import_path; 301 let mut import_path_without_last_segment = import_data.import_path;
294 let _ = import_path_without_last_segment.segments.pop(); 302 let _ = import_path_without_last_segment.segments.pop();
295 303
296 if !import_path_without_last_segment.segments.is_empty() { 304 if !import_path_without_last_segment.segments.is_empty() {
@@ -303,7 +311,11 @@ impl Builder {
303 label = format!("{}::{}", import_path_without_last_segment, label); 311 label = format!("{}::{}", import_path_without_last_segment, label);
304 } 312 }
305 313
306 let rewriter = insert_use::insert_use(&import_scope, import, merge_behaviour); 314 let rewriter = insert_use::insert_use(
315 &import_data.import_scope,
316 import,
317 import_data.merge_behaviour,
318 );
307 if let Some(old_ast) = rewriter.rewrite_root() { 319 if let Some(old_ast) = rewriter.rewrite_root() {
308 algo::diff(&old_ast, &rewriter.rewrite(&old_ast)).into_text_edit(&mut text_edits); 320 algo::diff(&old_ast, &rewriter.rewrite(&old_ast)).into_text_edit(&mut text_edits);
309 } 321 }
@@ -395,11 +407,8 @@ impl Builder {
395 self.trigger_call_info = Some(true); 407 self.trigger_call_info = Some(true);
396 self 408 self
397 } 409 }
398 pub(crate) fn import_data( 410 pub(crate) fn add_import(mut self, import_to_add: Option<ImportToAdd>) -> Builder {
399 mut self, 411 self.import_to_add = import_to_add;
400 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
401 ) -> Builder {
402 self.import_data = import_data;
403 self 412 self
404 } 413 }
405 pub(crate) fn set_ref_match( 414 pub(crate) fn set_ref_match(
diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs
index e9704c27c..e84aef0e4 100644
--- a/crates/completion/src/render.rs
+++ b/crates/completion/src/render.rs
@@ -16,8 +16,8 @@ use syntax::TextRange;
16use test_utils::mark; 16use test_utils::mark;
17 17
18use crate::{ 18use crate::{
19 config::SnippetCap, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, 19 config::SnippetCap, item::ImportToAdd, CompletionContext, CompletionItem, CompletionItemKind,
20 CompletionScore, 20 CompletionKind, CompletionScore,
21}; 21};
22 22
23use crate::render::{enum_variant::render_enum_variant, function::render_fn, macro_::render_macro}; 23use crate::render::{enum_variant::render_enum_variant, function::render_fn, macro_::render_macro};
@@ -48,15 +48,15 @@ pub(crate) fn render_resolution<'a>(
48 48
49pub(crate) fn render_resolution_with_import<'a>( 49pub(crate) fn render_resolution_with_import<'a>(
50 ctx: RenderContext<'a>, 50 ctx: RenderContext<'a>,
51 import: ModPath, 51 import_path: ModPath,
52 import_scope: ImportScope, 52 import_scope: ImportScope,
53 merge_behaviour: Option<MergeBehaviour>, 53 merge_behaviour: Option<MergeBehaviour>,
54 resolution: &ScopeDef, 54 resolution: &ScopeDef,
55) -> Option<CompletionItem> { 55) -> Option<CompletionItem> {
56 let local_name = import.segments.last()?.to_string(); 56 let local_name = import_path.segments.last()?.to_string();
57 Render::new(ctx).render_resolution( 57 Render::new(ctx).render_resolution(
58 local_name, 58 local_name,
59 Some((import, import_scope, merge_behaviour)), 59 Some(ImportToAdd { import_path, import_scope, merge_behaviour }),
60 resolution, 60 resolution,
61 ) 61 )
62} 62}
@@ -147,7 +147,7 @@ impl<'a> Render<'a> {
147 fn render_resolution( 147 fn render_resolution(
148 self, 148 self,
149 local_name: String, 149 local_name: String,
150 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>, 150 import_to_add: Option<ImportToAdd>,
151 resolution: &ScopeDef, 151 resolution: &ScopeDef,
152 ) -> Option<CompletionItem> { 152 ) -> Option<CompletionItem> {
153 let _p = profile::span("render_resolution"); 153 let _p = profile::span("render_resolution");
@@ -160,15 +160,16 @@ impl<'a> Render<'a> {
160 160
161 let kind = match resolution { 161 let kind = match resolution {
162 ScopeDef::ModuleDef(Function(func)) => { 162 ScopeDef::ModuleDef(Function(func)) => {
163 let item = render_fn(self.ctx, import_data, Some(local_name), *func); 163 let item = render_fn(self.ctx, import_to_add, Some(local_name), *func);
164 return Some(item); 164 return Some(item);
165 } 165 }
166 ScopeDef::ModuleDef(EnumVariant(var)) => { 166 ScopeDef::ModuleDef(EnumVariant(var)) => {
167 let item = render_enum_variant(self.ctx, import_data, Some(local_name), *var, None); 167 let item =
168 render_enum_variant(self.ctx, import_to_add, Some(local_name), *var, None);
168 return Some(item); 169 return Some(item);
169 } 170 }
170 ScopeDef::MacroDef(mac) => { 171 ScopeDef::MacroDef(mac) => {
171 let item = render_macro(self.ctx, import_data, local_name, *mac); 172 let item = render_macro(self.ctx, import_to_add, local_name, *mac);
172 return item; 173 return item;
173 } 174 }
174 175
@@ -193,7 +194,7 @@ impl<'a> Render<'a> {
193 local_name, 194 local_name,
194 ) 195 )
195 .kind(CompletionItemKind::UnresolvedReference) 196 .kind(CompletionItemKind::UnresolvedReference)
196 .import_data(import_data) 197 .add_import(import_to_add)
197 .build(); 198 .build();
198 return Some(item); 199 return Some(item);
199 } 200 }
@@ -248,7 +249,7 @@ impl<'a> Render<'a> {
248 249
249 let item = item 250 let item = item
250 .kind(kind) 251 .kind(kind)
251 .import_data(import_data) 252 .add_import(import_to_add)
252 .set_documentation(docs) 253 .set_documentation(docs)
253 .set_ref_match(ref_match) 254 .set_ref_match(ref_match)
254 .build(); 255 .build();
diff --git a/crates/completion/src/render/enum_variant.rs b/crates/completion/src/render/enum_variant.rs
index 5d4fbb641..f4bd02f25 100644
--- a/crates/completion/src/render/enum_variant.rs
+++ b/crates/completion/src/render/enum_variant.rs
@@ -1,24 +1,23 @@
1//! Renderer for `enum` variants. 1//! Renderer for `enum` variants.
2 2
3use hir::{HasAttrs, HirDisplay, ModPath, StructKind}; 3use hir::{HasAttrs, HirDisplay, ModPath, StructKind};
4use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
5use itertools::Itertools; 4use itertools::Itertools;
6use test_utils::mark; 5use test_utils::mark;
7 6
8use crate::{ 7use crate::{
9 item::{CompletionItem, CompletionItemKind, CompletionKind}, 8 item::{CompletionItem, CompletionItemKind, CompletionKind, ImportToAdd},
10 render::{builder_ext::Params, RenderContext}, 9 render::{builder_ext::Params, RenderContext},
11}; 10};
12 11
13pub(crate) fn render_enum_variant<'a>( 12pub(crate) fn render_enum_variant<'a>(
14 ctx: RenderContext<'a>, 13 ctx: RenderContext<'a>,
15 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>, 14 import_to_add: Option<ImportToAdd>,
16 local_name: Option<String>, 15 local_name: Option<String>,
17 variant: hir::EnumVariant, 16 variant: hir::EnumVariant,
18 path: Option<ModPath>, 17 path: Option<ModPath>,
19) -> CompletionItem { 18) -> CompletionItem {
20 let _p = profile::span("render_enum_variant"); 19 let _p = profile::span("render_enum_variant");
21 EnumVariantRender::new(ctx, local_name, variant, path).render(import_data) 20 EnumVariantRender::new(ctx, local_name, variant, path).render(import_to_add)
22} 21}
23 22
24#[derive(Debug)] 23#[derive(Debug)]
@@ -63,10 +62,7 @@ impl<'a> EnumVariantRender<'a> {
63 } 62 }
64 } 63 }
65 64
66 fn render( 65 fn render(self, import_to_add: Option<ImportToAdd>) -> CompletionItem {
67 self,
68 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
69 ) -> CompletionItem {
70 let mut builder = CompletionItem::new( 66 let mut builder = CompletionItem::new(
71 CompletionKind::Reference, 67 CompletionKind::Reference,
72 self.ctx.source_range(), 68 self.ctx.source_range(),
@@ -75,7 +71,7 @@ impl<'a> EnumVariantRender<'a> {
75 .kind(CompletionItemKind::EnumVariant) 71 .kind(CompletionItemKind::EnumVariant)
76 .set_documentation(self.variant.docs(self.ctx.db())) 72 .set_documentation(self.variant.docs(self.ctx.db()))
77 .set_deprecated(self.ctx.is_deprecated(self.variant)) 73 .set_deprecated(self.ctx.is_deprecated(self.variant))
78 .import_data(import_data) 74 .add_import(import_to_add)
79 .detail(self.detail()); 75 .detail(self.detail());
80 76
81 if self.variant_kind == StructKind::Tuple { 77 if self.variant_kind == StructKind::Tuple {
diff --git a/crates/completion/src/render/function.rs b/crates/completion/src/render/function.rs
index 07e99058a..542383d7e 100644
--- a/crates/completion/src/render/function.rs
+++ b/crates/completion/src/render/function.rs
@@ -1,22 +1,21 @@
1//! Renderer for function calls. 1//! Renderer for function calls.
2 2
3use hir::{HasSource, ModPath, Type}; 3use hir::{HasSource, Type};
4use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
5use syntax::{ast::Fn, display::function_declaration}; 4use syntax::{ast::Fn, display::function_declaration};
6 5
7use crate::{ 6use crate::{
8 item::{CompletionItem, CompletionItemKind, CompletionKind}, 7 item::{CompletionItem, CompletionItemKind, CompletionKind, ImportToAdd},
9 render::{builder_ext::Params, RenderContext}, 8 render::{builder_ext::Params, RenderContext},
10}; 9};
11 10
12pub(crate) fn render_fn<'a>( 11pub(crate) fn render_fn<'a>(
13 ctx: RenderContext<'a>, 12 ctx: RenderContext<'a>,
14 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>, 13 import_to_add: Option<ImportToAdd>,
15 local_name: Option<String>, 14 local_name: Option<String>,
16 fn_: hir::Function, 15 fn_: hir::Function,
17) -> CompletionItem { 16) -> CompletionItem {
18 let _p = profile::span("render_fn"); 17 let _p = profile::span("render_fn");
19 FunctionRender::new(ctx, local_name, fn_).render(import_data) 18 FunctionRender::new(ctx, local_name, fn_).render(import_to_add)
20} 19}
21 20
22#[derive(Debug)] 21#[derive(Debug)]
@@ -39,10 +38,7 @@ impl<'a> FunctionRender<'a> {
39 FunctionRender { ctx, name, fn_, ast_node } 38 FunctionRender { ctx, name, fn_, ast_node }
40 } 39 }
41 40
42 fn render( 41 fn render(self, import_to_add: Option<ImportToAdd>) -> CompletionItem {
43 self,
44 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
45 ) -> CompletionItem {
46 let params = self.params(); 42 let params = self.params();
47 CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), self.name.clone()) 43 CompletionItem::new(CompletionKind::Reference, self.ctx.source_range(), self.name.clone())
48 .kind(self.kind()) 44 .kind(self.kind())
@@ -50,7 +46,7 @@ impl<'a> FunctionRender<'a> {
50 .set_deprecated(self.ctx.is_deprecated(self.fn_)) 46 .set_deprecated(self.ctx.is_deprecated(self.fn_))
51 .detail(self.detail()) 47 .detail(self.detail())
52 .add_call_parens(self.ctx.completion, self.name, params) 48 .add_call_parens(self.ctx.completion, self.name, params)
53 .import_data(import_data) 49 .add_import(import_to_add)
54 .build() 50 .build()
55 } 51 }
56 52
diff --git a/crates/completion/src/render/macro_.rs b/crates/completion/src/render/macro_.rs
index b1284f201..b4ab32c6e 100644
--- a/crates/completion/src/render/macro_.rs
+++ b/crates/completion/src/render/macro_.rs
@@ -1,24 +1,22 @@
1//! Renderer for macro invocations. 1//! Renderer for macro invocations.
2 2
3use hir::{Documentation, HasSource, ModPath}; 3use hir::{Documentation, HasSource};
4use ide_helpers::insert_use::{ImportScope, MergeBehaviour};
5use syntax::display::macro_label; 4use syntax::display::macro_label;
6use test_utils::mark; 5use test_utils::mark;
7 6
8use crate::{ 7use crate::{
9 item::{CompletionItem, CompletionItemKind, CompletionKind}, 8 item::{CompletionItem, CompletionItemKind, CompletionKind, ImportToAdd},
10 render::RenderContext, 9 render::RenderContext,
11}; 10};
12 11
13pub(crate) fn render_macro<'a>( 12pub(crate) fn render_macro<'a>(
14 ctx: RenderContext<'a>, 13 ctx: RenderContext<'a>,
15 // TODO kb add some object instead of a tuple? 14 import_to_add: Option<ImportToAdd>,
16 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
17 name: String, 15 name: String,
18 macro_: hir::MacroDef, 16 macro_: hir::MacroDef,
19) -> Option<CompletionItem> { 17) -> Option<CompletionItem> {
20 let _p = profile::span("render_macro"); 18 let _p = profile::span("render_macro");
21 MacroRender::new(ctx, name, macro_).render(import_data) 19 MacroRender::new(ctx, name, macro_).render(import_to_add)
22} 20}
23 21
24#[derive(Debug)] 22#[derive(Debug)]
@@ -40,10 +38,7 @@ impl<'a> MacroRender<'a> {
40 MacroRender { ctx, name, macro_, docs, bra, ket } 38 MacroRender { ctx, name, macro_, docs, bra, ket }
41 } 39 }
42 40
43 fn render( 41 fn render(&self, import_to_add: Option<ImportToAdd>) -> Option<CompletionItem> {
44 &self,
45 import_data: Option<(ModPath, ImportScope, Option<MergeBehaviour>)>,
46 ) -> Option<CompletionItem> {
47 // FIXME: Currently proc-macro do not have ast-node, 42 // FIXME: Currently proc-macro do not have ast-node,
48 // such that it does not have source 43 // such that it does not have source
49 if self.macro_.is_proc_macro() { 44 if self.macro_.is_proc_macro() {
@@ -55,7 +50,7 @@ impl<'a> MacroRender<'a> {
55 .kind(CompletionItemKind::Macro) 50 .kind(CompletionItemKind::Macro)
56 .set_documentation(self.docs.clone()) 51 .set_documentation(self.docs.clone())
57 .set_deprecated(self.ctx.is_deprecated(self.macro_)) 52 .set_deprecated(self.ctx.is_deprecated(self.macro_))
58 .import_data(import_data) 53 .add_import(import_to_add)
59 .detail(self.detail()); 54 .detail(self.detail());
60 55
61 let needs_bang = self.needs_bang(); 56 let needs_bang = self.needs_bang();