@@ -5,7 +5,7 @@ use helix_view::{document::Mode, info::Info, input::KeyEvent};
55use serde::Deserialize;
66use std::{
77 borrow::Cow,
8− collections::HashMap,
8+ collections::{BTreeSet, HashMap},
99 ops::{Deref, DerefMut},
1010};
1111
@@ -137,20 +137,28 @@ impl KeyTrieNode {
137137 }
138138
139139 pub fn infobox(&self) -> Info {
140− let mut body: Vec<(&str, Vec<KeyEvent>)> = Vec::with_capacity(self.len());
140+ let mut body: Vec<(&str, BTreeSet<KeyEvent>)> = Vec::with_capacity(self.len());
141141 for (&key, trie) in self.iter() {
142142 let desc = match trie {
143143 KeyTrie::Leaf(cmd) => cmd.doc(),
144144 KeyTrie::Node(n) => n.name(),
145145 };
146146 match body.iter().position(|(d, _)| d == &desc) {
147− // FIXME: multiple keys are ordered randomly (use BTreeSet)
148− Some(pos) => body[pos].1.push(key),
149− None => body.push((desc, vec![key])),
147+ Some(pos) => {
148+ body[pos].1.insert(key);
149+ }
150+ None => {
151+ let mut keys = BTreeSet::new();
152+ keys.insert(key);
153+ body.push((desc, keys));
154+ }
150155 }
151156 }
152157 body.sort_unstable_by_key(|(_, keys)| {
153− self.order.iter().position(|&k| k == keys[0]).unwrap()
158+ self.order
159+ .iter()
160+ .position(|&k| k == *keys.iter().next().unwrap())
161+ .unwrap()
154162 });
155163 let prefix = format!("{} ", self.name());
156164 if body.iter().all(|(desc, _)| desc.starts_with(&prefix)) {