Include None value from second object while merging dicts #670
Open
AdamOlczak wants to merge 1 commit intopython-lsp:developfrom
Open
Include None value from second object while merging dicts #670AdamOlczak wants to merge 1 commit intopython-lsp:developfrom
AdamOlczak wants to merge 1 commit intopython-lsp:developfrom
Conversation
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
1 participant
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 commit includes None value in merged output dict for keys that only exist in second input dict (also while nested).
The original logic is preserving a[key] value if b[key] is None, this remains unchanged.
Added test cases for this behavior.
Context:
This function is used while getting Config.settings.
As per CONFIGURATION.md
pylsp.rope.ropeFoldercan be a null value.When configuration is received from the client, it is correctly parsed to None value, thus the
config._settings["rope"]["ropeFolder] = None.Once merged the output settings["rope"] dict didn't contain key "ropeFolder".
I believe that merge dict was behaving correctly if "rope" key didn't exist however when workspace/didChangeConfiguration got sent and "rope" key did exist with dict containing "extensionModules" list, in my case, the "ropeFolder" was completely ignored by
merge_dictsThis will fix #664 and I believe #622
Fyi @osiewicz