diff options
| author | Michael Davis | 2022-04-23 08:10:34 +0000 |
|---|---|---|
| committer | GitHub | 2022-04-23 08:10:34 +0000 |
| commit | 2c7f770aa9b094afca4454c8e85c8a963112ec32 (patch) | |
| tree | b880b3afde3d6ce2b815cc2218424dd69be43bc7 /helix-loader/src/config.rs | |
| parent | 19d042dde6ac7aad5b597c791c1f142f5c7f7198 (diff) | |
Only merge top-level array when merging `languages.toml` (#2215)
* Revert "Revert "override nested arrays when merging TOML (#2145)""
This reverts commit 35d2693630a4ec29a654704bc4be47badb8d6070.
* flip top-level table merging flag
Diffstat (limited to 'helix-loader/src/config.rs')
| -rw-r--r-- | helix-loader/src/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs index 5dc2d6b6..a8c84361 100644 --- a/helix-loader/src/config.rs +++ b/helix-loader/src/config.rs @@ -19,7 +19,7 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> { .into_iter() .chain([default_lang_config()].into_iter()) .fold(toml::Value::Table(toml::value::Table::default()), |a, b| { - crate::merge_toml_values(b, a) + crate::merge_toml_values(b, a, true) }); Ok(config) |