aboutsummaryrefslogtreecommitdiff
path: root/helix-core
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-11-09 01:58:23 +0000
committerBlaž Hrastnik2021-11-09 01:58:23 +0000
commite18198aeb2ef46681d404fe6adc8ffbd507f1db3 (patch)
tree306b21363a28cfe88fd81850bbcaaf3ed0e32fd7 /helix-core
parentf804ed3192600fcfd704f3613edde37bbba26050 (diff)
Revert "fix(core): stop merging array toml config values (#1004)"
It breaks languages.toml merging This reverts commit 4304b52ff86f829115cb89b20160b4f80dbb3dbd.
Diffstat (limited to 'helix-core')
-rw-r--r--helix-core/src/lib.rs55
1 files changed, 34 insertions, 21 deletions
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index 6168d02c..d1720df0 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -103,7 +103,25 @@ 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) {
@@ -131,13 +149,12 @@ mod merge_toml_tests {
fn language_tomls() {
use toml::Value;
- const USER: &str = r#"
+ const USER: &str = "
[[language]]
- name = "typescript"
- test = "bbb"
- indent = { tab-width = 4, unit = " ", test = "aaa" }
- language-server = { command = "deno", args = ["lsp"] }
- "#;
+ name = \"nix\"
+ test = \"bbb\"
+ indent = { tab-width = 4, unit = \" \", test = \"aaa\" }
+ ";
let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
.expect("Couldn't parse built-in langauges config");
@@ -145,27 +162,23 @@ mod merge_toml_tests {
let merged = merge_toml_values(base, user);
let languages = merged.get("language").unwrap().as_array().unwrap();
- let ts = languages
+ let nix = languages
.iter()
- .find(|v| v.get("name").unwrap().as_str().unwrap() == "typescript")
+ .find(|v| v.get("name").unwrap().as_str().unwrap() == "nix")
.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
- 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!(
- ts.get("language-server")
- .unwrap()
- .get("args")
- .unwrap()
- .as_array()
- .unwrap(),
- &vec![Value::String("lsp".into())],
+ nix_indent.get("tab-width").unwrap().as_integer().unwrap(),
+ 4
);
+ 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(), "#");
}
}