Vitalii ShevtsovandKirill Bulatov
2f10cba7c6
# Objective Fixes #62916. With `"lsp_results_location": "picker"`, `cmd-b` opens the LSP locations picker but cmd-clicking the same symbol still opens a `Definitions for …` multibuffer. #61187 fixed this for the go-to-definition *fallback*; the definition path itself was left behind. The setting is only consulted by `handle_nav_action` in `lsp_locations`, which runs when one of the navigation *actions* is dispatched. Cmd-click never dispatches them: `cmd_click_reveal_task` either navigates the cached hover links itself, or calls `go_to_definition_of_kind` / `go_to_type_definition` directly. ## Solution Both cmd-click paths now dispatch the matching action (`GoToDefinition`, `GoToTypeDefinition`, …) when `lsp_results_location` is `picker` and the click is not a split one, so the picker gets its chance; everything else is untouched: - with the default `multi_buffer` setting `picker_action` returns `None` and the old code runs unchanged; - alt (split) clicks keep their current behavior, since the split actions have no picker handler; - URL and file links keep opening directly — the action is only dispatched when every resolved link is a `HoverLink::Text`. The dispatch is deferred to after the current editor update via `cx.spawn_in`: `LspLocationsPicker::open_for_editor` reads the editor, so dispatching inline panics with `cannot read editor::Editor while it is already being updated` (this is also why the existing fallback dispatch happens from a spawn). ## Testing `cargo test -p lsp_locations` — two new tests, one per cmd-click path: a cold cmd-click, and a cmd-click on a link already resolved by hovering with the modifier held (the path users actually hit). Both fail on `main` with the fix reverted and pass with it. Also ran `cargo test -p editor --lib hover` (68 passed) and `cargo clippy -p editor -p lsp_locations --all-targets`. Not yet verified by hand in a running Zed build — the automated tests above are what backs this. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Release Notes: - Fixed cmd-click on a symbol ignoring the `lsp_results_location` setting: with `"picker"` it opened a definitions multibuffer instead of the picker that `cmd-b` opens ([#62916](https://github.com/zed-industries/zed/issues/62916)). --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev>
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 discussion)
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
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
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.