David AneksteinandLukas Wirth
8ce20e167c
## Context This PR updates a misleading comment in the remote edit merge path in the text CRDT. At `crates/text/src/text.rs`, the code skips fragments when `fragment.timestamp > timestamp`, but the comment described this as "lower lamport timestamp." In this codebase, Lamport ordering is ascending (`value`, then `replica_id`), so `>` means a higher Lamport timestamp. This change is comment-only and does not change runtime behavior. ## How to Review 1. Open `crates/text/src/text.rs` and inspect the updated two-line comment above the `while let Some(fragment) = old_fragments.item()` loop in `apply_remote_edit`. 2. Confirm the condition directly below is unchanged: `fragment.timestamp > timestamp`. 3. (Optional) Cross-check Lamport ordering in `crates/clock/src/clock.rs` (`impl Ord for Lamport`) to confirm the wording. ## 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 is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior (comment-only change; no behavior changes) - [x] Performance impact has been considered and is acceptable Release Notes: - N/A Co-authored-by: Lukas Wirth <lukas@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 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.