Bette sorting in picker in case of ties

helix-term/src/ui/picker.rs

@@ -467,8 +467,7 @@ impl<T: Item> Picker<T> {
                     None => false,
                 }
             });
-
-            self.matches.sort_unstable();
+            self.sort_matches();
         } else {
             self.force_score();
         }
@@ -502,7 +501,20 @@ impl<T: Item> Picker<T> {
                         })
                 }),
         );
-        self.matches.sort_unstable();
+        self.sort_matches();
+    }
+
+    /// Sort matches by (score, text).
+    fn sort_matches(&mut self) {
+        self.matches.sort_unstable_by(|l, r| {
+            l.cmp(r).then_with(|| {
+                let l_option = &self.options[l.index];
+                let l_text = l_option.filter_text(&self.editor_data);
+                let r_option = &self.options[r.index];
+                let r_text = r_option.filter_text(&self.editor_data);
+                l_text.cmp(&r_text)
+            })
+        });
     }
 
     /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)