Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only merge top-level array when merging languages.toml #2215

Merged
merged 2 commits into from
Apr 23, 2022

Conversation

the-mikedavis
Copy link
Member

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 merging config.toml and not languages.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

[[language]]
name = "erlang"
auto-format = true

and all appears to be well 👍

closes #1000

@the-mikedavis the-mikedavis changed the title override nested arrays when merging TOML Only merge top-level array when merging languages.toml Apr 21, 2022
@the-mikedavis
Copy link
Member Author

This also does not hang infinitely for me with the long languages.toml #2187 (comment)

@archseer archseer merged commit 2c7f770 into helix-editor:master Apr 23, 2022
@the-mikedavis the-mikedavis deleted the md-fix-language-merge branch April 23, 2022 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrectly merging built-in and user config languages.toml files for typescript lsp
2 participants