summaryrefslogtreecommitdiff
path: root/helix-core/src/lib.rs
diff options
context:
space:
mode:
authorCarter Snook2021-11-08 00:50:03 +0000
committerGitHub2021-11-08 00:50:03 +0000
commit4304b52ff86f829115cb89b20160b4f80dbb3dbd (patch)
treeae3bd91410fa74ab8542c98a36878488713a0027 /helix-core/src/lib.rs
parent29fe504398e483b8830564727ee8e2f209f06615 (diff)
fix(core): stop merging array toml config values (#1004)
Diffstat (limited to 'helix-core/src/lib.rs')
-rw-r--r--helix-core/src/lib.rs55
1 files changed, 21 insertions, 34 deletions
diff --git a/helix-core/src/lib.rs b/helix-core/src/lib.rs
index d1720df0..6168d02c 100644
--- a/helix-core/src/lib.rs
+++ b/helix-core/src/lib.rs
@@ -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) {
@@ -149,12 +131,13 @@ 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");
@@ -162,23 +145,27 @@ mod merge_toml_tests {
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(), "#");
}
}