aboutsummaryrefslogtreecommitdiff
path: root/helix-loader/src/config.rs
Commit message (Collapse)AuthorAge
* Refactor 'helix-loader::merge_toml_values' to use a 'merge-depth' instead of ↵Philipp Mildenberger2022-07-26
| | | | | | 'merge_toplevel_arrays' (#3080) - This ensures that other values than just the arrays are overridden, like nested objects, where it makes sense - merge_depth is set to 3 so that top-level language features are merged (like 'scope'), but everything deeper is overridden with the user-config
* Only merge top-level array when merging `languages.toml` (#2215)Michael Davis2022-04-23
| | | | | | | * Revert "Revert "override nested arrays when merging TOML (#2145)"" This reverts commit 35d2693630a4ec29a654704bc4be47badb8d6070. * flip top-level table merging flag
* Revert "override nested arrays when merging TOML (#2145)"Blaž Hrastnik2022-04-20
| | | | | | Looks like there's some follow-up issues This reverts commit c8cfd0b1a0da071618a9efc71ac5735d6147a0ca.
* override nested arrays when merging TOML (#2145)Michael Davis2022-04-20
| | | | | | | | We merge the elements of arrays for the top-level array. For `languages.toml`, this is the array of languages. For any nested arrays, we simply take the `right` array as-is instead of using the union of `left` and `right`. closes #1000
* Fixing (in two ways) a small typo (#2156)Ben Lee-Cohen2022-04-18
|
* Add support for local language configuration (#1249)Kirawi2022-04-18
* add local configuration * move config loading to Application::new * simplify find_root_impl