fix: load rust-analyzer.toml for virtual workspaces#21704
Merged
ChayimFriedman2 merged 1 commit intorust-lang:masterfrom Apr 6, 2026
Merged
Conversation
rustbot
added
the
S-waiting-on-review
Contributor
Author
ChayimFriedman2
requested changes
Apr 6, 2026
| exclude: vec![ws_root.join(".git"), ws_root.join("target")], | ||
| }); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
This will include unwanted things in the workspace. Instead only include ws_root/rust-analyzer.toml.
| } | ||
|
|
||
| #[test] | ||
| #[ignore = "flaky test that tends to hang"] |
Contributor
There was a problem hiding this comment.
Why did you remove this ignores?
Contributor
Author
There was a problem hiding this comment.
sorry these were accidental
Contributor
Author
There was a problem hiding this comment.
reverted. I also reverted my overly aggressive edit to docs/book/src/configuration.md
ChayimFriedman2
approved these changes
Apr 6, 2026
Madoshakalaka
force-pushed
the
fix/ratoml-virtual-workspace-loading
branch
from
efd2b8e to
865e224
Compare
Contributor
Author
done |
ChayimFriedman2
approved these changes
Apr 6, 2026
rustbot
removed
the
S-waiting-on-review
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
Fixes the most common case of broken
rust-analyzer.tomlloading: virtual workspacesFor virtual workspaces,
ProjectWorkspace::to_roots()only createsPackageRoots for member crate packages. The workspace root directory itself gets none.Any
rust-analyzer.tomlplaced at the workspace root then falls into the default (library) source root and is silently ignored byprocess_changes().The fix ensures every workspace root is included as a local source root in
ProjectFolders::new(), even when no package lives there.Relates to #13529, fixes #18943.