Cole Miller
a5eb666951
When committing, it was possible for the left-hand side multibuffer to get the updated base text (via the `buffer_changed_since_sync` mechanism) without updating its diff snapshot for that buffer (via the diff subscription), causing a mismatch between that multibuffer's diff state and its buffer state. The fix is to ensure for inverted diffs that we always update pull an updated diff snapshot as part of `sync_from_buffer_changes`. This also removes some code that we added in #44838 to sync the left-hand side multibuffer when edits on the right-hand side invalided diff hunks. Instead, the left-hand side will just sync the next time the diff recalculates when this happens, and will always consider hunks from the last diff calculation as valid--so there will be a short window where the diff transforms and `diff_hunks_in_range` don't match between the two sides. That's okay because we don't rely on this in the display map--the code that translates positions between the two sides accesses the diff's `InternalDiffHunk`s directly rather than going through a multibuffer API. Release Notes: - N/A
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.