Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 8, 2021
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions helix-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,7 @@ pub fn cache_dir() -> std::path::PathBuf {
pub fn merge_toml_values(left: toml::Value, right: toml::Value) -> toml::Value {
use toml::Value;

fn get_name(v: &Value) -> Option<&str> {
v.get("name").and_then(Value::as_str)
}

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)) => {
for (rname, rvalue) in right_map {
match left_map.remove(&rname) {
Expand Down Expand Up @@ -149,36 +131,41 @@ mod merge_toml_tests {
fn language_tomls() {
use toml::Value;

const USER: &str = "
const USER: &str = r#"
[[language]]
name = \"nix\"
test = \"bbb\"
indent = { tab-width = 4, unit = \" \", test = \"aaa\" }
";
name = "typescript"
test = "bbb"
indent = { tab-width = 4, unit = " ", test = "aaa" }
language-server = { command = "deno", args = ["lsp"] }
"#;

let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
.expect("Couldn't parse built-in langauges config");
let user: Value = toml::from_str(USER).unwrap();

let merged = merge_toml_values(base, user);
let languages = merged.get("language").unwrap().as_array().unwrap();
let nix = languages
let ts = languages
.iter()
.find(|v| v.get("name").unwrap().as_str().unwrap() == "nix")
.find(|v| v.get("name").unwrap().as_str().unwrap() == "typescript")
.unwrap();
let nix_indent = nix.get("indent").unwrap();
let ts_indent = ts.get("indent").unwrap();

// 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!(
nix_indent.get("tab-width").unwrap().as_integer().unwrap(),
4
ts.get("language-server")
.unwrap()
.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(), "#");
}
}

Expand Down