andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-01-19 13:37:06 +04:00
Code Issues Projects Releases Wiki Activity

Revert "fix(core): stop merging array toml config values (#1004)"

Browse Source 
It breaks languages.toml merging

This reverts commit 4304b52ff8.
This commit is contained in:
Blaž Hrastnik 2021-11-09 10:58:23 +09:00
parent f804ed3192
commit e18198aeb2
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
helix-core/src/lib.rs
View File

@ -103,7 +103,25 @@ pub fn cache_dir() -> std::path::PathBuf {
pub fn merge_toml_values(left: toml::Value, right: toml::Value) -> toml::Value { pub fn merge_toml_values(left: toml::Value, right: toml::Value) -> toml::Value {
use toml::Value; use toml::Value;
fn get_name(v: &Value) -> Option<&str> {
v.get("name").and_then(Value::as_str)
}
match (left, right) { match (left, right) {
(Value::Array(mut left_items), Value::Array(right_items)) => {
left_items.reserve(right_items.len());
for rvalue in right_items {
let lvalue = get_name(&rvalue)
.and_then(|rname| left_items.iter().position(|v| get_name(v) == Some(rname)))
.map(|lpos| left_items.remove(lpos));
let mvalue = match lvalue {
Some(lvalue) => merge_toml_values(lvalue, rvalue),
None => rvalue,
};
left_items.push(mvalue);
}
Value::Array(left_items)
}
(Value::Table(mut left_map), Value::Table(right_map)) => { (Value::Table(mut left_map), Value::Table(right_map)) => {
for (rname, rvalue) in right_map { for (rname, rvalue) in right_map {
match left_map.remove(&rname) { match left_map.remove(&rname) {
@ -131,13 +149,12 @@ mod merge_toml_tests {
fn language_tomls() { fn language_tomls() {
use toml::Value; use toml::Value;
const USER: &str = r#" const USER: &str = "
[[language]] [[language]]
name = "typescript" name = \"nix\"
test = "bbb" test = \"bbb\"
indent = { tab-width = 4, unit = " ", test = "aaa" } indent = { tab-width = 4, unit = \" \", test = \"aaa\" }
language-server = { command = "deno", args = ["lsp"] } ";
"#;
let base: Value = toml::from_slice(include_bytes!("../../languages.toml")) let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
.expect("Couldn't parse built-in langauges config"); .expect("Couldn't parse built-in langauges config");
@ -145,27 +162,23 @@ fn language_tomls() {
let merged = merge_toml_values(base, user); let merged = merge_toml_values(base, user);
let languages = merged.get("language").unwrap().as_array().unwrap(); let languages = merged.get("language").unwrap().as_array().unwrap();
let ts = languages let nix = languages
.iter() .iter()
.find(|v| v.get("name").unwrap().as_str().unwrap() == "typescript") .find(|v| v.get("name").unwrap().as_str().unwrap() == "nix")
.unwrap(); .unwrap();
let ts_indent = ts.get("indent").unwrap(); let nix_indent = nix.get("indent").unwrap();
// We changed tab-width and unit in indent so check them if they are the new values // We changed tab-width and unit in indent so check them if they are the new values
assert_eq!(ts_indent.get("tab-width").unwrap().as_integer().unwrap(), 4);
assert_eq!(ts_indent.get("unit").unwrap().as_str().unwrap(), " ");
// We added a new keys, so check them
assert_eq!(ts.get("test").unwrap().as_str().unwrap(), "bbb");
assert_eq!(ts_indent.get("test").unwrap().as_str().unwrap(), "aaa");
assert_eq!( assert_eq!(
ts.get("language-server") nix_indent.get("tab-width").unwrap().as_integer().unwrap(),
.unwrap() 4
.get("args")
.unwrap()
.as_array()
.unwrap(),
&vec![Value::String("lsp".into())],
); );
assert_eq!(nix_indent.get("unit").unwrap().as_str().unwrap(), " ");
// We added a new keys, so check them
assert_eq!(nix.get("test").unwrap().as_str().unwrap(), "bbb");
assert_eq!(nix_indent.get("test").unwrap().as_str().unwrap(), "aaa");
// We didn't change comment-token so it should be same
assert_eq!(nix.get("comment-token").unwrap().as_str().unwrap(), "#");
} }
} }