Refactor 'helix-loader::merge_toml_values' to use a 'merge-depth' instead of 'merge_toplevel_arrays' #3080
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the-mikedavis
approved these changes
Jul 15, 2022
helix-loader/src/config.rs
Outdated
Comment on lines
22
to
38
| crate::merge_toml_values(b, a, true) | ||
| crate::merge_toml_values(b, a, 3) |
There was a problem hiding this comment.
I think it's worth a comment here explaining why it's 3 for the languages.toml (just here is probably fine, I don't think it needs to be repeated in the tests)
…tead of 'merge_toplevel_arrays' - 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
Philipp-M
force-pushed
the
merge-toml-values-with-merge-depth
branch
from
400533e
to
3828db2
Compare
thomasskk
pushed a commit
to thomasskk/helix
that referenced
this pull request
Sep 9, 2022
…tead of 'merge_toplevel_arrays' (helix-editor#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
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ensures that other values than just the top-level arrays are overridden, and makes this function generally more flexible, like merging nested objects, where it makes sense.
For the
languages.toml,merge_depthis set to 3 so that top-level language features are merged (like 'scope'), but everything deeper is overridden with the user-config. With the current configuration schema the result should be equivalent to the current behavior.This change is a requirement for #2507 since language-servers there, are configured via a table instead of an array.