Don't just filter commands by fuzzy match, also order the matches

helix-editor · Dec 30, 2021 · a066f59 · a066f59
1 parent bcf3808
commit a066f59
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
@@ -3074,11 +3074,19 @@ fn command_mode(cx: &mut Context) {
             // simple heuristic: if there's no just one part, complete command name.
             // if there's a space, per command completion kicks in.
             if parts.len() <= 1 {
-                let end = 0..;
-                cmd::TYPABLE_COMMAND_LIST
+                let mut matches: Vec<_> = cmd::TYPABLE_COMMAND_LIST
                     .iter()
-                    .filter(|command| FUZZY_MATCHER.fuzzy_match(command.name, input).is_some())
-                    .map(|command| (end.clone(), Cow::Borrowed(command.name)))
+                    .filter_map(|command| {
+                        FUZZY_MATCHER
+                            .fuzzy_match(command.name, input)
+                            .map(|score| (command.name, score))
+                    })
+                    .collect();
+
+                matches.sort_unstable_by_key(|(_file, score)| std::cmp::Reverse(*score));
+                matches
+                    .into_iter()
+                    .map(|(name, _)| (0.., name.into()))
                     .collect()
             } else {
                 let part = parts.last().unwrap();