@@ -103,25 +103,7 @@ pub fn cache_dir() -> std::path::PathBuf {
103103pub fn merge_toml_values(left: toml::Value, right: toml::Value) -> toml::Value {
104104 use toml::Value;
105105
106− fn get_name(v: &Value) -> Option<&str> {
107− v.get("name").and_then(Value::as_str)
108− }
109−
110106 match (left, right) {
111− (Value::Array(mut left_items), Value::Array(right_items)) => {
112− left_items.reserve(right_items.len());
113− for rvalue in right_items {
114− let lvalue = get_name(&rvalue)
115− .and_then(|rname| left_items.iter().position(|v| get_name(v) == Some(rname)))
116− .map(|lpos| left_items.remove(lpos));
117− let mvalue = match lvalue {
118− Some(lvalue) => merge_toml_values(lvalue, rvalue),
119− None => rvalue,
120− };
121− left_items.push(mvalue);
122− }
123− Value::Array(left_items)
124− }
125107 (Value::Table(mut left_map), Value::Table(right_map)) => {
126108 for (rname, rvalue) in right_map {
127109 match left_map.remove(&rname) {
@@ -149,12 +131,13 @@ mod merge_toml_tests {
149131 fn language_tomls() {
150132 use toml::Value;
151133
152− const USER: &str = "
134+ const USER: &str = r#"
153135 [[language]]
154− name = \"nix\"
155− test = \"bbb\"
156− indent = { tab-width = 4, unit = \" \", test = \"aaa\" }
157− ";
136+ name = "typescript"
137+ test = "bbb"
138+ indent = { tab-width = 4, unit = " ", test = "aaa" }
139+ language-server = { command = "deno", args = ["lsp"] }
140+ "#;
158141
159142 let base: Value = toml::from_slice(include_bytes!("../../languages.toml"))
160143 .expect("Couldn't parse built-in langauges config");
@@ -162,23 +145,27 @@ mod merge_toml_tests {
162145
163146 let merged = merge_toml_values(base, user);
164147 let languages = merged.get("language").unwrap().as_array().unwrap();
165− let nix = languages
148+ let ts = languages
166149 .iter()
167− .find(|v| v.get("name").unwrap().as_str().unwrap() == "nix")
150+ .find(|v| v.get("name").unwrap().as_str().unwrap() == "typescript")
168151 .unwrap();
169− let nix_indent = nix.get("indent").unwrap();
152+ let ts_indent = ts.get("indent").unwrap();
170153
171154 // We changed tab-width and unit in indent so check them if they are the new values
155+ assert_eq!(ts_indent.get("tab-width").unwrap().as_integer().unwrap(), 4);
156+ assert_eq!(ts_indent.get("unit").unwrap().as_str().unwrap(), " ");
157+ // We added a new keys, so check them
158+ assert_eq!(ts.get("test").unwrap().as_str().unwrap(), "bbb");
159+ assert_eq!(ts_indent.get("test").unwrap().as_str().unwrap(), "aaa");
172160 assert_eq!(
173− nix_indent.get("tab-width").unwrap().as_integer().unwrap(),
174− 4
161+ ts.get("language-server")
162+ .unwrap()
163+ .get("args")
164+ .unwrap()
165+ .as_array()
166+ .unwrap(),
167+ &vec![Value::String("lsp".into())],
175168 );
176− assert_eq!(nix_indent.get("unit").unwrap().as_str().unwrap(), " ");
177− // We added a new keys, so check them
178− assert_eq!(nix.get("test").unwrap().as_str().unwrap(), "bbb");
179− assert_eq!(nix_indent.get("test").unwrap().as_str().unwrap(), "aaa");
180− // We didn't change comment-token so it should be same
181− assert_eq!(nix.get("comment-token").unwrap().as_str().unwrap(), "#");
182169 }
183170}
184171