suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor keymap map visitor to reduce # of cases

pull/3958/head
Matthew Cheely 2022-09-24 21:31:15 -04:00
parent a7f603361a
commit a5d1c0571a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helix-term/src/keymap.rs
View File

@ -218,20 +218,16 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
match command {
None => Ok(KeyTrie::Node(KeyTrieNode::new(label, mapping, order))),
Some(cmd) => {
if label.is_empty() {
Ok(KeyTrie::Leaf(cmd))
let status = (cmd, label.is_empty());
if let (MappableCommand::Typable { name, args, .. }, false) = status {
Ok(MappableCommand::Typable {
name,
args,
doc: label.to_string(),
})
.map(KeyTrie::Leaf)
} else {
match cmd {
MappableCommand::Typable { name, args, .. } => {
Ok(MappableCommand::Typable {
name,
args,
doc: label.to_string(),
})
.map(KeyTrie::Leaf)
}
MappableCommand::Static { .. } => Ok(KeyTrie::Leaf(cmd)),
}
Ok(KeyTrie::Leaf(status.0))
}
}
}