git.iko.soy/helix
on master help sign in
Fixes #1991 LSP Auto-import (#2088)
commitdc8fef5dd311e239150dfcd62c90cc84ee32a8a0 authorAndrey Tkachenko <andrey@aidev.ru> dateSat 16 Apr 2022, 05:43 (5 years ago) parentb04c425
2 files changed+16−5
compare with master
unifiedsplit
helix-lsp/src/client.rs+7 helix-term/src/ui/completion.rs+9−5
helix-lsp/src/client.rs+7
@@ -293,6 +293,13 @@ impl Client {
293293 completion: Some(lsp::CompletionClientCapabilities {
294294 completion_item: Some(lsp::CompletionItemCapability {
295295 snippet_support: Some(false),
296+ resolve_support: Some(lsp::CompletionItemCapabilityResolveSupport {
297+ properties: vec![
298+ String::from("documentation"),
299+ String::from("detail"),
300+ String::from("additionalTextEdits"),
301+ ],
302+ }),
296303 ..Default::default()
297304 }),
298305 completion_item_kind: Some(lsp::CompletionItemKindCapability {
helix-term/src/ui/completion.rs+9−5
@@ -178,17 +178,21 @@ impl Completion {
178178 });
179179
180180 // apply additional edits, mostly used to auto import unqualified types
181− let resolved_additional_text_edits = if item.additional_text_edits.is_some() {
181+ let resolved_item = if item
182+ .additional_text_edits
183+ .as_ref()
184+ .map(|edits| !edits.is_empty())
185+ .unwrap_or(false)
186+ {
182187 None
183188 } else {
184189 Self::resolve_completion_item(doc, item.clone())
185− .and_then(|item| item.additional_text_edits)
186190 };
187191
188− if let Some(additional_edits) = item
189− .additional_text_edits
192+ if let Some(additional_edits) = resolved_item
190193 .as_ref()
191− .or(resolved_additional_text_edits.as_ref())
194+ .and_then(|item| item.additional_text_edits.as_ref())
195+ .or(item.additional_text_edits.as_ref())
192196 {
193197 if !additional_edits.is_empty() {
194198 let transaction = util::generate_transaction_from_edits(