Xin Zhao
afaef857b9
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 Closes #57030 When `fullFunctionSignatures` is enabled in `rust-analyzer`, some completion items returned by the language server have an unexpected `filterText`. For example: ```jsonc { "label": "sync_all(…)", "labelDetails": { "detail": "(alias fsync)", "description": "pub fn sync_all(&self) -> io::Result<()>" }, "kind": 2, "sortText": "7ffffffa", "filterText": "sync_allfsync", ... } ``` For such completion items, the rust-analyzer adapter falls back to an outer range passed into the `mk_label` closure to determine the display range: https://github.com/zed-industries/zed/blob/c32c037c6b2b582552edc8c6b9bda513412c3bf4/crates/languages/src/rust.rs#L362-L371 For functions or methods, this fallback range is calculated here: https://github.com/zed-industries/zed/blob/c32c037c6b2b582552edc8c6b9bda513412c3bf4/crates/languages/src/rust.rs#L424-L435 In this example, the `function_signature` is `"pub fn sync_all(&self) -> io::Result<()>"`, and the regex matches up to `fn sync_all(&self) -> io::Result<(`. Currently, the range passed to the `mk_label` closure mistakenly covers `"ub fn sync_all(&self) -> io::Result<"` (causing the first character 'p' to be truncated, as reported in #57030), whereas we only want `"sync_all"` itself This PR introduces two main changes to fix this behavior: - Adjust the range start: Skip the leading `fn` keyword so that the range starts exactly at the function or method name. - Update the regex pattern: The current pattern matches up to the last `(`, which causes incorrect slicing if the return type contains parentheses (e.g., `Result<()>`). This is changed to match up to the first `(`. Release Notes: - Fixed some rust completions has `ub fn ` as prefix when `fullFunctionSignatures` is enabled
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.