fix: preserve list order when merging settings - #723
Open
yangfan-yf-yf wants to merge 1 commit into
Open
Conversation
yangfan-yf-yf
marked this pull request as ready for review
August 9, 2026 12:05
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.
Fixes #677.
Problem
merge_dicts()merges two list values withlist(set(a + b)). The set removes duplicates but also discards first-occurrence order, so configuration lists can vary across hash seeds. This is observable for ordered argument lists such aspylsp_mypyoverrides, where option and value positions matter.The existing merge behavior, introduced in #38, concatenates both lists and removes duplicates. This change preserves that behavior rather than redefining duplicate handling.
Change
dict.fromkeys(...)so the first occurrence wins and list order is stableValidation
pytest test/test_utils.py -q- 10 passed$env:PYTHONUTF8='1'; python -m pytest test/ -q --deselect=test/test_language_server.py::test_missing_message- 190 passed, 21 skipped, 1 deselectedruff check pylsp testruff format --check pylsp testgit diff --checktest_missing_messageis the single deselected test. It times out in this local Windows environment on both the unmodifieddevelopcommit and this branch; it does not exercise_utils.merge_dicts.