ui: completion: Use sort_text to sort the completions

helix-term/src/ui/completion.rs

@@ -14,6 +14,10 @@ use helix_lsp::{lsp, util};
 use lsp::CompletionItem;
 
 impl menu::Item for CompletionItem {
+    fn sort_text(&self) -> &str {
+        self.filter_text.as_ref().unwrap_or(&self.label).as_str()
+    }
+
     fn filter_text(&self) -> &str {
         self.filter_text.as_ref().unwrap_or(&self.label).as_str()
     }

helix-term/src/ui/menu.rs

@@ -11,7 +11,7 @@ use helix_view::{graphics::Rect, Editor};
 use tui::layout::Constraint;
 
 pub trait Item {
-    // TODO: sort_text
+    fn sort_text(&self) -> &str;
     fn filter_text(&self) -> &str;
 
     fn label(&self) -> &str;
@@ -64,24 +64,21 @@ impl<T: Item> Menu<T> {
         let Self {
             ref mut matcher,
             ref mut matches,
+            ref options,
             ..
         } = *self;
 
         // reuse the matches allocation
         matches.clear();
-        matches.extend(
+        matches.extend(options.iter().enumerate().filter_map(|(index, option)| {
-            self.options
+            let text = option.filter_text();
-                .iter()
+            // TODO: using fuzzy_indices could give us the char idx for match highlighting
-                .enumerate()
+            matcher
-                .filter_map(|(index, option)| {
+                .fuzzy_match(text, pattern)
-                    let text = option.filter_text();
+                .map(|score| (index, score))
-                    // TODO: using fuzzy_indices could give us the char idx for match highlighting
+        }));
-                    matcher
+        // matches.sort_unstable_by_key(|(_, score)| -score);
-                        .fuzzy_match(text, pattern)
+        matches.sort_unstable_by_key(|(index, _score)| options[*index].sort_text());
-                        .map(|score| (index, score))
-                }),
-        );
-        matches.sort_unstable_by_key(|(_, score)| -score);
 
         // reset cursor position
         self.cursor = None;
@@ -223,8 +220,6 @@ impl<T: Item + 'static> Component for Menu<T> {
         EventResult::Ignored
     }
 
-    // TODO: completion sorting
-
     fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
         let n = self
             .options