Only merge top-level array when merging languages.toml
#2215
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.
history: this is a revert of the revert of #2145 with a fix on top. #2145 accidentally took out all array merging.
I got a bit confused when sorting out a merge conflict when rebasing #2145: I thought the call in
helix-loader/src/config.rs:22
was mergingconfig.toml
and notlanguages.toml
😅So that boolean was just wrong and that was preventing the top-level array in languages.toml with user-specified languages.toml overrides. I gave this a spin locally with
and all appears to be well 👍
closes #1000