andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

resolve completions before applying transactions

Browse Source
This commit is contained in:
Pascal Kuthe 2023-04-04 23:35:31 +02:00 committed by Blaž Hrastnik
parent 5406e9f629
commit 30ff7f8db2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helix-term/src/ui/completion.rs
View File

@ -253,6 +253,17 @@ fn completion_changes(transaction: &Transaction, trigger_offset: usize) -> Vec<C
// always present here // always present here
let item = item.unwrap(); let item = item.unwrap();
// apply additional edits, mostly used to auto import unqualified types
let resolved_item = if item
.additional_text_edits
.as_ref()
.map(|edits| !edits.is_empty())
.unwrap_or(false)
{
None
} else {
Self::resolve_completion_item(doc, item.clone())
};
// if more text was entered, remove it // if more text was entered, remove it
doc.restore(view, &savepoint, true); doc.restore(view, &savepoint, true);
@ -272,17 +283,6 @@ fn completion_changes(transaction: &Transaction, trigger_offset: usize) -> Vec<C
changes: completion_changes(&transaction, trigger_offset), changes: completion_changes(&transaction, trigger_offset),
}); });
// apply additional edits, mostly used to auto import unqualified types
let resolved_item = if item
.additional_text_edits
.as_ref()
.map(|edits| !edits.is_empty())
.unwrap_or(false)
{
None
} else {
Self::resolve_completion_item(doc, item.clone())
};
if let Some(additional_edits) = resolved_item if let Some(additional_edits) = resolved_item
.as_ref() .as_ref()
.and_then(|item| item.additional_text_edits.as_ref()) .and_then(|item| item.additional_text_edits.as_ref())