diff options
Diffstat (limited to 'crates/completion/src/lib.rs')
-rw-r--r-- | crates/completion/src/lib.rs | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/crates/completion/src/lib.rs b/crates/completion/src/lib.rs index c57203c80..938c92dbb 100644 --- a/crates/completion/src/lib.rs +++ b/crates/completion/src/lib.rs | |||
@@ -11,8 +11,11 @@ mod render; | |||
11 | 11 | ||
12 | mod completions; | 12 | mod completions; |
13 | 13 | ||
14 | use ide_db::base_db::FilePosition; | 14 | use ide_db::{ |
15 | use ide_db::RootDatabase; | 15 | base_db::FilePosition, helpers::insert_use::ImportScope, imports_locator, RootDatabase, |
16 | }; | ||
17 | use syntax::AstNode; | ||
18 | use text_edit::TextEdit; | ||
16 | 19 | ||
17 | use crate::{completions::Completions, context::CompletionContext, item::CompletionKind}; | 20 | use crate::{completions::Completions, context::CompletionContext, item::CompletionKind}; |
18 | 21 | ||
@@ -131,6 +134,31 @@ pub fn completions( | |||
131 | Some(acc) | 134 | Some(acc) |
132 | } | 135 | } |
133 | 136 | ||
137 | /// Resolves additional completion data at the position given. | ||
138 | pub fn resolve_completion_edits( | ||
139 | db: &RootDatabase, | ||
140 | config: &CompletionConfig, | ||
141 | position: FilePosition, | ||
142 | full_import_path: &str, | ||
143 | imported_name: &str, | ||
144 | ) -> Option<TextEdit> { | ||
145 | let ctx = CompletionContext::new(db, position, config)?; | ||
146 | let anchor = ctx.name_ref_syntax.as_ref()?; | ||
147 | let import_scope = ImportScope::find_insert_use_container(anchor.syntax(), &ctx.sema)?; | ||
148 | |||
149 | let current_module = ctx.sema.scope(anchor.syntax()).module()?; | ||
150 | let current_crate = current_module.krate(); | ||
151 | |||
152 | let import_path = imports_locator::find_exact_imports(&ctx.sema, current_crate, imported_name) | ||
153 | .filter_map(|candidate| { | ||
154 | let item: hir::ItemInNs = candidate.either(Into::into, Into::into); | ||
155 | current_module.find_use_path(db, item) | ||
156 | }) | ||
157 | .find(|mod_path| mod_path.to_string() == full_import_path)?; | ||
158 | |||
159 | ImportEdit { import_path, import_scope, merge_behaviour: config.merge }.to_text_edit() | ||
160 | } | ||
161 | |||
134 | #[cfg(test)] | 162 | #[cfg(test)] |
135 | mod tests { | 163 | mod tests { |
136 | use crate::config::CompletionConfig; | 164 | use crate::config::CompletionConfig; |