Skip to content

Commit 7d3f736

Browse files
committed
Simplify EditorView::set_or_extend_completion
1 parent 8d3f30c commit 7d3f736

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
@@ -982,19 +982,16 @@ impl EditorView {
982982
trigger_offset: usize,
983983
size: Rect,
984984
) {
985+
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
986+
// TODO test/check if this is enough/safe...
985987
match &mut self.completion {
986-
Some(completion) => {
987-
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
988-
// TODO test/check if this is enough/safe...
988+
Some(completion)
989989
if start_offset == completion.start_offset()
990-
&& completion.trigger_offset() == trigger_offset
991-
{
992-
completion.add_completion_items(items)
993-
} else {
994-
self.set_completion(editor, items, start_offset, trigger_offset, size)
995-
}
990+
&& completion.trigger_offset() == trigger_offset =>
991+
{
992+
completion.add_completion_items(items)
996993
}
997-
None => self.set_completion(editor, items, start_offset, trigger_offset, size),
994+
_ => self.set_completion(editor, items, start_offset, trigger_offset, size),
998995
}
999996
}
1000997

0 commit comments

Comments
 (0)