helix

Author	SHA1	Message	Date
Pascal Kuthe	e9dc9f4935	Switch from toml::from_slice to toml::from_str (#5659 )	2 years ago
Philipp Mildenberger	235237ddc4	Refactor 'helix-loader::merge_toml_values' to use a 'merge-depth' instead of '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	2 years ago
Michael Davis	2c7f770aa9	Only merge top-level array when merging `languages.toml` (#2215 ) * Revert "Revert "override nested arrays when merging TOML (#2145)"" This reverts commit `35d2693630`. * flip top-level table merging flag	3 years ago
Blaž Hrastnik	35d2693630	Revert "override nested arrays when merging TOML (#2145 )" Looks like there's some follow-up issues This reverts commit `c8cfd0b1a0`.	3 years ago
Michael Davis	c8cfd0b1a0	override nested arrays when merging TOML (#2145 ) 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	3 years ago
Ben Lee-Cohen	2bddec02e7	Fixing (in two ways) a small typo (#2156 )	3 years ago
Kirawi	c2a40d9d52	Add support for local language configuration (#1249 ) * add local configuration * move config loading to Application::new * simplify find_root_impl	3 years ago