From b4a3dd8f89d6b3c1c973be2dfb2121c4b6cb501f Mon Sep 17 00:00:00 2001
From: lazytanuki <43273245+lazytanuki@users.noreply.github.com>
Date: Thu, 27 Oct 2022 16:16:55 +0200
Subject: [PATCH] feat(lsp): LSP preselected items appear first in completion
 menu (#4480)

* feat(lsp): LSP preselected items appear first in completion menu

* fix: shorter diff
---
 helix-term/src/ui/completion.rs | 6 +++++-
 helix-term/src/ui/menu.rs       | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index a21767f944f8..de7c3232bb3d 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -92,11 +92,15 @@ impl Completion {
 
     pub fn new(
         editor: &Editor,
-        items: Vec<CompletionItem>,
+        mut items: Vec<CompletionItem>,
         offset_encoding: helix_lsp::OffsetEncoding,
         start_offset: usize,
         trigger_offset: usize,
     ) -> Self {
+        // Sort completion items according to their preselect status (given by the LSP server)
+        items.sort_by_key(|item| !item.preselect.unwrap_or(false));
+
+        // Then create the menu
         let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
             fn item_to_transaction(
                 doc: &Document,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 75769b905b2a..99c2473d6f40 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -108,7 +108,8 @@ impl<T: Item> Menu<T> {
                         .map(|score| (index, score))
                 }),
         );
-        self.matches.sort_unstable_by_key(|(_, score)| -score);
+        // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
+        self.matches.sort_by_key(|(_, score)| -score);
 
         // reset cursor position
         self.cursor = None;