anxyumandKirill Bulatov
f08b5e4d67
# Objective Fixes #58104. When using the `fold_at_level` action (default keybind: Ctrl-K Ctrl-(1-9) on Windows) on a function with its arguments split across multiple lines (see the example in #58104), only the arguments would be folded, while the function body remained expanded and only blocks at the next level inside the function were folded. To reproduce: 1. Open a `.rs` file (or any language with similar folding behavior). 2. Add a function with multiline arguments: ```rust fn test( a: i32, ) { let b = a; } ``` 3. Run `fold_at_level` with level `1`. 4. Observe that the argument list is folded, but the function body remains expanded. ## Solution When iterating through foldable ranges, `fold_at_level` advanced the search position to the line after the folded crease. This caused it to skip any crease starting on the same line as the end of the previous one. The fix keeps the search position on the last line of the folded crease instead, allowing consecutive creases to be processed. ## Testing Automated: Added 1 test covering chained foldable blocks, including functions with multiline arguments and if/else blocks. Manual: Verified that invoking `fold_at_level(1)` on a function with multiline arguments folds both the argument list and the function body. ## 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 ## Showcase **Before:** <img width="211" height="107" alt="image" src="https://github.com/user-attachments/assets/dbfbbdfa-faee-42f3-ac25-0581a796e124" /> **After:** <img width="221" height="41" alt="image" src="https://github.com/user-attachments/assets/6746b341-0587-48a4-908a-e743c974cae9" /> ## Release Notes: - Fixed: `fold_at_level` not folding function bodies when arguments span multiple lines --------- 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.