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

Fix runtime config parse issues after rebase on latest master

pull/3958/head
Matthew Cheely 2023-06-10 19:31:36 -04:00
parent f4ac049e6c
commit 7366b3e8b0
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
helix-term/src/config.rs
View File

@ -187,21 +187,27 @@ mod tests {
b = { label = "buffer", b = "buffer_picker", n = "goto_next_buffer" } b = { label = "buffer", b = "buffer_picker", n = "goto_next_buffer" }
"#; "#;
let mut keys = keymap::default();
merge_keys(
&mut keys,
hashmap! {
Mode::Normal => Keymap::new(keymap!({ "Normal mode"
"f" => { ""
"f" => file_picker,
"c" => wclose,
},
"b" => { "buffer"
"b" => buffer_picker,
"n" => goto_next_buffer,
},
})),
},
);
assert_eq!( assert_eq!(
toml::from_str::<Config>(sample_keymaps).unwrap(), Config::load_test(sample_keymaps),
Config { Config {
keys: hashmap! { keys,
Mode::Normal => Keymap::new(keymap!({ "Normal mode"
"f" => { ""
"f" => file_picker,
"c" => wclose,
},
"b" => { "buffer"
"b" => buffer_picker,
"n" => goto_next_buffer,
},
})),
},
..Default::default() ..Default::default()
} }
); );
@ -221,7 +227,7 @@ mod tests {
c = ":buffer-close" c = ":buffer-close"
"#; "#;
let config = toml::from_str::<Config>(sample_keymaps).unwrap(); let config = Config::load_test(sample_keymaps);
let tree = config.keys.get(&Mode::Normal).unwrap().root(); let tree = config.keys.get(&Mode::Normal).unwrap().root();

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

@ -197,14 +197,14 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
where where
M: serde::de::MapAccess<'de>, M: serde::de::MapAccess<'de>,
{ {
let mut label = ""; let mut label = String::from("");
let mut command = None; let mut command = None;
let mut mapping = HashMap::new(); let mut mapping = HashMap::new();
let mut order = Vec::new(); let mut order = Vec::new();
while let Some(key) = map.next_key::<&str>()? { while let Some(key) = map.next_key::<String>()? {
match key { match &key as &str {
"label" => label = map.next_value::<&str>()?, "label" => label = map.next_value::<String>()?,
"command" => command = Some(map.next_value::<MappableCommand>()?), "command" => command = Some(map.next_value::<MappableCommand>()?),
_ => { _ => {
let key_event = key.parse::<KeyEvent>().map_err(serde::de::Error::custom)?; let key_event = key.parse::<KeyEvent>().map_err(serde::de::Error::custom)?;
@ -216,7 +216,7 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
} }
match command { match command {
None => Ok(KeyTrie::Node(KeyTrieNode::new(label, mapping, order))), None => Ok(KeyTrie::Node(KeyTrieNode::new(label.as_str(), mapping, order))),
Some(_command) if !order.is_empty() => { Some(_command) if !order.is_empty() => {
Err(serde::de::Error::custom("ambiguous mapping: 'command' is only valid with 'label', but I found other keys")) Err(serde::de::Error::custom("ambiguous mapping: 'command' is only valid with 'label', but I found other keys"))
} }