git.iko.soy/helix
on master help sign in
feat(lsp): LSP preselected items appear first in completion menu (#4480)
b4a3dd8lazytanuki
helix-term/src/ui/completion.rs+5−1
compare with master
unifiedsplit
@@ -92,11 +92,15 @@ impl Completion {
92
92
93 pub fn new(
93 pub fn new(
94 editor: &Editor,
94 editor: &Editor,
95− items: Vec<CompletionItem>,
95+ mut items: Vec<CompletionItem>,
96 offset_encoding: helix_lsp::OffsetEncoding,
96 offset_encoding: helix_lsp::OffsetEncoding,
97 start_offset: usize,
97 start_offset: usize,
98 trigger_offset: usize,
98 trigger_offset: usize,
99 ) -> Self {
99 ) -> Self {
100+ // Sort completion items according to their preselect status (given by the LSP server)
101+ items.sort_by_key(|item| !item.preselect.unwrap_or(false));
102+
103+ // Then create the menu
100 let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
104 let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
101 fn item_to_transaction(
105 fn item_to_transaction(
102 doc: &Document,
106 doc: &Document,
helix-term/src/ui/menu.rs+2−1
@@ -108,7 +108,8 @@ impl<T: Item> Menu<T> {
108 .map(|score| (index, score))
108 .map(|score| (index, score))
109 }),
109 }),
110 );
110 );
111+ // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
111− self.matches.sort_unstable_by_key(|(_, score)| -score);
112+ self.matches.sort_by_key(|(_, score)| -score);
112
113
113 // reset cursor position
114 // reset cursor position
114 self.cursor = None;
115 self.cursor = None;