suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,607 Commits
25 Branches
28 Tags
139 MiB
Commit Graph

11 Commits (2a782ddc9c7fb5e1cf06fe81fc4f1444dc5dc697)

Author SHA1 Message Date
Austin L Wolfgram efdcf34b79
Fix out of date comments on merge_toml_values (#13253) 
merge_toplevel_arrays is no longer a parameter for this method, and the
example fits better in a doc comment.
 2025-04-06 13:00:18 -05:00
Pascal Kuthe 5b3dd6a678 implement proper lsp-workspace support 
fix typo

Co-authored-by: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
 2023-03-29 12:57:30 +09:00
Pascal Kuthe 2d10a429eb add workspace config and manual LSP root management 
fixup documentation

Co-authored-by: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>

fixup typo

Co-authored-by: LeoniePhiline <22329650+LeoniePhiline@users.noreply.github.com>
 2023-03-29 12:57:30 +09:00
Miguel Madrid-Mencía d2d3024337
Fix clippy 1.67 warnings (#5697) 2023-01-27 09:43:46 -06:00
Pascal Kuthe e9dc9f4935
Switch from toml::from_slice to toml::from_str (#5659) 2023-01-24 10:07:01 -06:00
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
 2022-07-26 09:40:38 +09:00
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
 2022-04-23 17:10:34 +09:00
Blaž Hrastnik 35d2693630
Revert "override nested arrays when merging TOML (#2145)" 
Looks like there's some follow-up issues

This reverts commit c8cfd0b1a0.
 2022-04-20 17:09:03 +09:00
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
 2022-04-20 10:43:09 +09:00
Ben Lee-Cohen 2bddec02e7
Fixing (in two ways) a small typo (#2156) 2022-04-18 13:12:47 +09:00
Kirawi c2a40d9d52
Add support for local language configuration (#1249) 
* add local configuration

* move config loading to Application::new

* simplify find_root_impl
 2022-04-18 12:10:51 +09:00