mirror of
https://github.com/zed-industries/zed.git
synced 2026-10-05 18:04:09 +02:00
Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
https://zed.dev
- Rust 95%
- JSON-with-Comments 2.6%
- Python 0.8%
- Inno Setup 0.3%
- Tree-sitter Query 0.3%
- Other 0.4%
eec3376016## Summary Closes #65085 With `git.show_stage_restore_buttons` set to `false`, the Git Panel diff view ("Uncommitted Changes") still draws a thin empty frame next to each hunk. `render_diff_hunk_controls` always builds a container with a border, rounded corners and a shadow, and only the children are conditional. In this view all hunks are already expanded, so the prev/next arrows aren't shown either. With the buttons disabled, nothing is left in the container, but the container is still drawn. This computes up front which controls will be shown and returns an empty element when there are none. `UnstagedDiffHunkRenderer` and the other hunk renderers already do this. The diff looks bigger than it is because removing the long inline conditions lets rustfmt dedent the button blocks by one level. `git diff -w` is about 17 lines. Before (buttons disabled, note the sliver on the right of the red row): <img width="814" height="254" alt="hunk-controls-before-empty-frame" src="https://github.com/user-attachments/assets/3057f67b-6aa0-4cc0-8c25-8f2c0c7090ae" /> After: <img width="814" height="254" alt="hunk-controls-after-fix" src="https://github.com/user-attachments/assets/6bf5bc65-4d7f-4172-b3ca-a0ee88f33ac5" /> ## Testing Tested manually on macOS 27.0, debug build. 1. Set `"git": { "show_stage_restore_buttons": false }` in settings. 2. Delete a whole line in any tracked file and open "Uncommitted Changes". 3. Hover the red block. Before this change there is a small empty frame on the right of the row, after it there is nothing. 4. Set the option to `true` and check that Stage and Restore are still shown and work. Ran `./script/clippy -p editor`, no warnings. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [ ] Tests cover the new or changed behavior. Release Notes: - Fixed an empty frame being drawn next to diff hunks in the Git Panel when the Stage/Restore buttons are disabled |
||
|---|---|---|
| .agents/skills | ||
| .cargo | ||
| .cloudflare | ||
| .config | ||
| .factory | ||
| .github | ||
| .wezel | ||
| .zed | ||
| assets | ||
| ci | ||
| crates | ||
| docs | ||
| extensions | ||
| legal | ||
| nix | ||
| script | ||
| tooling | ||
| .git-blame-ignore-revs | ||
| .gitattributes | ||
| .gitignore | ||
| .mailmap | ||
| .prettierrc | ||
| .rules | ||
| AGENTS.md | ||
| Cargo.lock | ||
| Cargo.toml | ||
| CLAUDE.md | ||
| clippy.toml | ||
| CODE_OF_CONDUCT.md | ||
| compose.yml | ||
| CONTRIBUTING.md | ||
| corgi.toml | ||
| default.nix | ||
| Dockerfile-collab | ||
| Dockerfile-collab.dockerignore | ||
| Dockerfile-cross.dockerignore | ||
| Dockerfile-distros | ||
| Dockerfile-distros.dockerignore | ||
| flake.lock | ||
| flake.nix | ||
| GEMINI.md | ||
| LICENSE-APACHE | ||
| LICENSE-GPL | ||
| Procfile | ||
| Procfile.web | ||
| README.md | ||
| rust-toolchain.toml | ||
| rustfmt.toml | ||
| shell.nix | ||
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.