Skip to content

Commit de72a59

Browse files
committed
Simplify EditorView::set_or_extend_completion
1 parent 9eeedfb commit de72a59

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

helix-term/src/ui/editor.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -945,19 +945,16 @@ impl EditorView {
945945
trigger_offset: usize,
946946
size: Rect,
947947
) {
948+
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
949+
// TODO test/check if this is enough/safe...
948950
match &mut self.completion {
949-
Some(completion) => {
950-
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
951-
// TODO test/check if this is enough/safe...
951+
Some(completion)
952952
if start_offset == completion.start_offset()
953-
&& completion.trigger_offset() == trigger_offset
954-
{
955-
completion.add_completion_items(items)
956-
} else {
957-
self.set_completion(editor, items, start_offset, trigger_offset, size)
958-
}
953+
&& completion.trigger_offset() == trigger_offset =>
954+
{
955+
completion.add_completion_items(items)
959956
}
960-
None => self.set_completion(editor, items, start_offset, trigger_offset, size),
957+
_ => self.set_completion(editor, items, start_offset, trigger_offset, size),
961958
}
962959
}
963960

0 commit comments

Comments
 (0)