@@ -154,8 +154,19 @@ impl Completion {
154154 );
155155 doc.apply(&transaction, view.id);
156156
157− if let Some(additional_edits) = &item.additional_text_edits {
158− // gopls uses this to add extra imports
157+ // apply additional edits, mostly used to auto import unqualified types
158+ let resolved_additional_text_edits = if item.additional_text_edits.is_some() {
159+ None
160+ } else {
161+ Completion::resolve_completion_item(doc, item.clone())
162+ .and_then(|item| item.additional_text_edits)
163+ };
164+
165+ if let Some(additional_edits) = item
166+ .additional_text_edits
167+ .as_ref()
168+ .or_else(|| resolved_additional_text_edits.as_ref())
169+ {
159170 if !additional_edits.is_empty() {
160171 let transaction = util::generate_transaction_from_edits(
161172 doc.text(),
@@ -181,6 +192,31 @@ impl Completion {
181192 completion
182193 }
183194
195+ fn resolve_completion_item(
196+ doc: &Document,
197+ completion_item: lsp::CompletionItem,
198+ ) -> Option<CompletionItem> {
199+ let language_server = doc.language_server()?;
200+ let completion_resolve_provider = language_server
201+ .capabilities()
202+ .completion_provider
203+ .as_ref()?
204+ .resolve_provider;
205+ if completion_resolve_provider != Some(true) {
206+ return None;
207+ }
208+
209+ let future = language_server.resolve_completion_item(completion_item);
210+ let response = helix_lsp::block_on(future);
211+ match response {
212+ Ok(completion_item) => Some(completion_item),
213+ Err(err) => {
214+ log::error!("execute LSP command: {}", err);
215+ None
216+ }
217+ }
218+ }
219+
184220 pub fn recompute_filter(&mut self, editor: &Editor) {
185221 // recompute menu based on matches
186222 let menu = self.popup.contents_mut();