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

Simplify labelled command pattern match 

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
pull/3958/head
Matthew Cheely 2022-10-04 19:18:22 -04:00
parent a5d1c0571a
commit 0d307265f6
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,19 +217,14 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
match command {
None => Ok(KeyTrie::Node(KeyTrieNode::new(label, mapping, order))),
Some(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 {
Ok(KeyTrie::Leaf(status.0))
}
Some(MappableCommand::Typable { name, args, .. }) if !label.is_empty() => {
Ok(KeyTrie::Leaf(MappableCommand::Typable {
name,
args,
doc: label.to_string(),
}))
}
Some(command) => Ok(KeyTrie::Leaf(command)),
}
}
}