dfed43ab24
This fixes the panics we we're seeing in `EditPreview::highlight_edits`. The reason for this was that we were interpolating edits incorrectly. Here's an example: ```rust let a = 0; // existing code let c = 2; // suggested by edit prediction ``` The edits would look like this: `[(Point(1, 0)..Point(1, 0), "let c = 2;"]` Now i type: ```rust let a = 0; // existing code let b = 1; // added this line let c = 2; // suggested by edit prediction ``` Before this change, the `interpolate` function would allow insertions before the edit prediction edits, the anchors will move to the next line. The edits would look now like this: `[(Point(2, 0)..Point(2, 0), "let c = 2;"]` However, now we end up with a call to `EditPreview::highlight_edits`, with the following parameters: - current_snapshot: ```rust let a = 0; let b = 1; ``` - edits: `[(Point(2, 0)..Point(2, 0), "let c = 2;"]` - applied_edits_snapshot: ```rust let a = 0; let c = 2; ``` And here you can see the issue, applying the `edits` to the `current_snapshot` should always end up re-creating the text that is present in the `applied_edits_snapshot`. That is not the case here though, meaning that the offsets in the new buffer are not correct, which can either lead to a confusing popup or a crash if the suggestion is at the end of the file. Here's a real world example (edit prediction is ONLY suggesting to delete a new line): <img width="487" alt="Screenshot 2025-01-27 at 13 05 26" src="https://github.com/user-attachments/assets/a0a8064e-8cfa-48b2-9f1c-efc2d0d9d7d4" /> We fixed this by only allowing interpolation if the user is editing after all the edit predictions OR if the user edit is a subset of the model suggestion. Co-Authored-by: Antonio <antonio@zed.dev> Release Notes: - N/A Co-authored-by: Antonio <antonio@zed.dev>
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS and Linux you can download Zed directly or install Zed via your local package manager.
Other platforms are not yet available:
- Windows (tracking issue)
- Web (tracking issue)
Developing Zed
- Building Zed for macOS
- Building Zed for Linux
- Building Zed for Windows
- Running Collaboration Locally
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.