on master help sign in
resolve completions before applying transactions
commit30ff7f8db29d5fc84191268b94ec971e7ca5da5d authorPascal Kuthe <pascal.kuthe@semimod.de> dateTue 4 Apr 2023, 23:35 (4 years ago) parent5406e9f
1 file changed+11−11
helix-term/src/ui/completion.rs+11−11
helix-term/src/ui/completion.rs+11−11
@@ -253,6 +253,17 @@ impl Completion {
253253 // always present here
254254 let item = item.unwrap();
255255
256+ // apply additional edits, mostly used to auto import unqualified types
257+ let resolved_item = if item
258+ .additional_text_edits
259+ .as_ref()
260+ .map(|edits| !edits.is_empty())
261+ .unwrap_or(false)
262+ {
263+ None
264+ } else {
265+ Self::resolve_completion_item(doc, item.clone())
266+ };
256267
257268 // if more text was entered, remove it
258269 doc.restore(view, &savepoint, true);
@@ -272,17 +283,6 @@ impl Completion {
272283 changes: completion_changes(&transaction, trigger_offset),
273284 });
274285
275− // apply additional edits, mostly used to auto import unqualified types
276− let resolved_item = if item
277− .additional_text_edits
278− .as_ref()
279− .map(|edits| !edits.is_empty())
280− .unwrap_or(false)
281− {
282− None
283− } else {
284− Self::resolve_completion_item(doc, item.clone())
285− };
286286 if let Some(additional_edits) = resolved_item
287287 .as_ref()
288288 .and_then(|item| item.additional_text_edits.as_ref())