Skip to content

Commit b685db7

Browse files
committed
Simplify EditorView::set_or_extend_completion
1 parent bd808ff commit b685db7

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
@@ -1024,19 +1024,16 @@ impl EditorView {
10241024
trigger_offset: usize,
10251025
size: Rect,
10261026
) {
1027+
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
1028+
// TODO test/check if this is enough/safe...
10271029
match &mut self.completion {
1028-
Some(completion) => {
1029-
// cheap check, if the completion menu resulted of the same 'completion' trigger (e.g. by commands::completion)
1030-
// TODO test/check if this is enough/safe...
1030+
Some(completion)
10311031
if start_offset == completion.start_offset()
1032-
&& completion.trigger_offset() == trigger_offset
1033-
{
1034-
completion.add_completion_items(items)
1035-
} else {
1036-
self.set_completion(editor, items, start_offset, trigger_offset, size)
1037-
}
1032+
&& completion.trigger_offset() == trigger_offset =>
1033+
{
1034+
completion.add_completion_items(items)
10381035
}
1039-
None => self.set_completion(editor, items, start_offset, trigger_offset, size),
1036+
_ => self.set_completion(editor, items, start_offset, trigger_offset, size),
10401037
}
10411038
}
10421039

0 commit comments

Comments
 (0)