ep: Fix cursor marker leak due to edit splitting in V4 API - #60110
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
anantdgoel
approved these changes
Jun 29, 2026
probably-neb
enabled auto-merge
June 29, 2026 19:00
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…tries#60110) # Objective Closes EP-202 Prevent V4 edit predictions from leaking `<|user_cursor|>` markers into users' buffers. ## Solution - Strip cursor marker text from emitted prediction edits, including when `text_diff` splits the marker across edit fragments. - Preserve literal marker-like text that already exists in the buffer. ## Testing - `cargo test -p edit_prediction prediction_edits_for_single_file_diff -- --nocapture` - `cargo test -p edit_prediction --lib` - `cargo fmt --check` ## 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 --- Release Notes: - N/A
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Objective
Closes EP-202
Prevent V4 edit predictions from leaking
<|user_cursor|>markers into users' buffers.Solution
text_diffsplits the marker across edit fragments.Testing
cargo test -p edit_prediction prediction_edits_for_single_file_diff -- --nocapturecargo test -p edit_prediction --libcargo fmt --checkSelf-Review Checklist:
Release Notes: