Fix setting selection for multi folder workspace#24819
Merged
MichaReiser merged 2 commits intomainfrom Apr 24, 2026
Merged
Conversation
|
charliermarsh
approved these changes
Apr 24, 2026
carljm
added a commit
to tamird/ruff
that referenced
this pull request
Apr 27, 2026
* main: (248 commits) [ty] bump conformance suite commit (astral-sh#24848) [ty] Pass unmapped type variables to `SpecializationBuilder::build_with` (astral-sh#24809) [ty] Avoid bookkeeping for unannotated functions (astral-sh#24842) [ty] Optimize signature checking based on number of arguments (astral-sh#24674) [ty] Avoid eagerly inferring legacy generic context (astral-sh#24841) [ty] Skip decorator inference for undecorated functions (astral-sh#24839) [ty] solve unions against generic protocols (astral-sh#24837) [ty] Lazily allocate parameter type builders (astral-sh#24838) [ty] Lazily compute call argument fallbacks (astral-sh#24836) [ty] Avoid collecting type context callables (astral-sh#24835) Bump ecosystem-analyzer to e7576e6 (astral-sh#24834) [ty] Support basic narrowing with aliased conditional expressions (astral-sh#24302) [ty] Fix project and workspace selection (astral-sh#24824) [ty] Fix missing memory usage attributes (astral-sh#24823) Fix setting selection for multi folder workspace (astral-sh#24819) Improve diagnostics for implicit calls to a possibly unbound unary operator. (astral-sh#24816) [ty] Update review pool (astral-sh#24818) Bump 0.15.12 (astral-sh#24815) [ty] Complete support for more detailed diagnostics on possibly unbound errors from implicit dunder calls against unions. (astral-sh#24676) Implement `#ruff:file-ignore` file-level suppressions (astral-sh#23599) ...
This was referenced Apr 27, 2026
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
3 participants
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 an issue where the server picked the settings of the wrong workspace folder
in a multi workspace folder project:
The issue is that we used
next_backto find the correct settings in the settings map.There are two open workspace folders:
When resolving the settings for
/X/systemtests/tests/common/fakes/wus.py,range(..).next_back()returned the settings of/X/external/Yinstead of/Xbecause/X/systemtests/tests/common/fakes/wus.pysorts after/X/external/y, even thoughit isn't a prefix of
/X/systemtest.This PR fixes the issue by using
rfindto find the longest match with a shared prefix.I plan to submit a similar PR for ty_server.
Fixes astral-sh/ruff-vscode#925
Test Plan
Added E2E test