@@ -78,19 +78,30 @@ macro_rules! keymap {
7878 };
7979}
8080
81−#[derive(Debug, Clone, Deserialize)]
81+#[derive(Debug, Clone)]
8282pub struct KeyTrieNode {
8383 /// A label for keys coming under this node, like "Goto mode"
84− #[serde(skip)]
8584 name: String,
86− #[serde(flatten)]
8785 map: HashMap<KeyEvent, KeyTrie>,
88− #[serde(skip)]
8986 order: Vec<KeyEvent>,
90− #[serde(skip)]
9187 pub is_sticky: bool,
9288}
9389
90+impl<'de> Deserialize<'de> for KeyTrieNode {
91+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
92+ where
93+ D: serde::Deserializer<'de>,
94+ {
95+ let map = HashMap::<KeyEvent, KeyTrie>::deserialize(deserializer)?;
96+ let order = map.keys().copied().collect::<Vec<_>>(); // NOTE: map.keys() has arbitrary order
97+ Ok(Self {
98+ map,
99+ order,
100+ ..Default::default()
101+ })
102+ }
103+}
104+
94105impl KeyTrieNode {
95106 pub fn new(name: &str, map: HashMap<KeyEvent, KeyTrie>, order: Vec<KeyEvent>) -> Self {
96107 Self {
@@ -118,22 +129,10 @@ impl KeyTrieNode {
118129 }
119130 self.map.insert(key, trie);
120131 }
121− self.set_order();
122− }
123−
124− /// Sets the order of the mapping recursively since the
125− /// the trie can contain child nodes without order.
126− /// The order is missing from child nodes since it's not
127− /// parsed from the config.toml
128− fn set_order(&mut self) {
129− for (&key, trie) in self.map.iter_mut() {
132+ for &key in self.map.keys() {
130133 if !self.order.contains(&key) {
131134 self.order.push(key);
132135 }
133− // Order must be recursively set
134− if let KeyTrie::Node(node) = trie {
135− node.set_order();
136− }
137136 }
138137 }
139138