Arthur Fournier
02a0ebaaeb
Closes #47926 ## Summary When using a uv (or Poetry/PDM) workspace with multiple subprojects, Python LSP servers (Pyright, Ruff, ty, etc.) are initialized with the subproject directory as their workspace folder instead of the workspace root. This happens because `PyprojectTomlManifestProvider::search()` returns the first (innermost) `pyproject.toml` found walking up the directory tree. For example, in a uv workspace like: main-project/ ├── pyproject.toml # workspace root with [tool.uv.workspace] ├── uv.lock ├── packages/ │ └── project-api/ │ └── pyproject.toml # subpackage └── projects/ └── project-a/ └── pyproject.toml # subpackage Opening a file in `packages/project-api/` would register `packages/project-api/` as the LSP workspace folder instead of `main-project/`. ## Approach The fix uses lockfile existence as a heuristic to detect workspace roots. The updated `search()` method walks all ancestors (similar to `CargoManifestProvider`) and: - Tracks the **innermost** `pyproject.toml` as a fallback - Tracks the **outermost** `pyproject.toml` that has a sibling lockfile (`uv.lock`, `poetry.lock`, `pdm.lock`, or `Pipfile.lock`) - Returns the outermost workspace root if found, otherwise falls back to the innermost This works within the existing `ManifestDelegate` interface (existence checks only, no file content reading). | Scenario | Result | |---|---| | uv workspace (root `pyproject.toml` + `uv.lock`) | Returns workspace root | | Poetry workspace (root `pyproject.toml` + `poetry.lock`) | Returns workspace root | | Simple project (single `pyproject.toml`, no lockfile) | Returns project dir (unchanged) | | Independent subprojects (no lockfile at any level) | Returns each project's own dir (unchanged) | Since the manifest provider is set at the Python **language** level, this fix applies to all Python LSP servers (Pyright, Ruff, ty, etc.). ## Test plan - [x] Added unit tests for `PyprojectTomlManifestProvider` covering all scenarios above - [x] Existing integration test `test_running_multiple_instances_of_a_single_server_in_one_worktree` passes (independent subprojects without lockfiles) - [x] `cargo check -p languages` compiles cleanly - [x] Manual testing with a real uv workspace (Pyright and Ruff both receive correct workspace root) Release Notes: - Fixed Python LSP servers (Pyright, Ruff, etc.) using the wrong workspace folder in uv/Poetry/PDM workspaces with multiple subprojects.
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking issue)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.