Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pylsp/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def _merge_dicts_(a, b):
if isinstance(a[key], dict) and isinstance(b[key], dict):
yield (key, dict(_merge_dicts_(a[key], b[key])))
elif isinstance(a[key], list) and isinstance(b[key], list):
yield (key, list(set(a[key] + b[key])))
yield (key, list(dict.fromkeys(a[key] + b[key])))
elif b[key] is not None:
yield (key, b[key])
else:
Expand Down
11 changes: 11 additions & 0 deletions test/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,17 @@ def test_merge_dicts() -> None:
) == {"a": False, "b": {"x": 123, "y": [], "z": 987}}


def test_merge_dicts_preserves_list_order() -> None:
assert _utils.merge_dicts({"items": [3, 2]}, {"items": [1, 3]}) == {
"items": [3, 2, 1]
}

overrides = ["--python-executable", "/tmp/venv/bin/python", True]
assert _utils.merge_dicts({"overrides": []}, {"overrides": overrides}) == {
"overrides": overrides
}


def test_clip_column() -> None:
assert _utils.clip_column(0, [], 0) == 0
assert _utils.clip_column(2, ["123"], 0) == 2
Expand Down