Use default settings if initialization options is empty or not provided#11566
Merged
dhruvmanila merged 2 commits intomainfrom May 27, 2024
Merged
Use default settings if initialization options is empty or not provided#11566dhruvmanila merged 2 commits intomainfrom
dhruvmanila merged 2 commits intomainfrom
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
CodSpeed Performance ReportMerging #11566 will improve performances by 11.03%Comparing Summary
Benchmarks breakdown
|
Contributor
|
MichaReiser
approved these changes
May 27, 2024
Member
MichaReiser
left a comment
There was a problem hiding this comment.
If we have none. Should we add a test for an empty settings object?
Member
Author
|
There is a test :) ruff/crates/ruff_server/src/session/settings.rs Lines 710 to 715 in 0b9fd71 |
This file contains hidden or 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
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.
Summary
This PR fixes the bug to avoid flattening the global-only settings for the new server.
This was added in #11497, possibly to correctly de-serialize an empty value (
{}). But, this lead to a bug where the configuration under thesettingskey was not being read for global-only variant.By using #[serde(default)], we ensure that the settings field in the
GlobalOnlyvariant is optional and that an empty JSON object{}is correctly deserialized intoGlobalOnlywith a defaultClientSettingsinstance.fixes: #11507
Test Plan
Update the snapshot and existing test case. Also, verify the following settings in Neovim:
settings