helix: Fix line selection after undoing delete - #55365
Merged
tomhoule merged 13 commits intoJun 5, 2026
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
ChristopherBiscardi
added
the
area:parity/helix
tomhoule
reviewed
Jun 5, 2026
|
|
||
| cx.set_state("oneˇ\ntwo\nthree", Mode::HelixNormal); | ||
| cx.simulate_keystrokes("d u x"); | ||
| cx.assert_state("«one\nˇ»two\nthree", Mode::HelixNormal); |
Contributor
There was a problem hiding this comment.
Isn't the expected behaviour cx.assert_state("«oneˇ»\ntwo\nthree", Mode::HelixNormal); (selection and cursor on the same line)? I just checked in Helix. This assertion seems to match what I see in Zed (current main).
Contributor
Author
There was a problem hiding this comment.
Yes, the cursor is on a newline character but the visible selection is on a character before it. This is how it is right now (somewhat hacky implementation of a helix mode itself). I had some proposal how all of that could be refactored here, if you are interested -> #56768
This assertion seems to match what I see in Zed (current main).
In the current main branch you will end up selecting both one and two in this example:
oneˇ
two
three
I think it was this commit which is responsible for it -> 81da953
Contributor
Author
There was a problem hiding this comment.
To be more precise in our concrete example it would be this code -> https://github.com/zed-industries/zed/blob/main/crates/editor/src/element.rs#L152 but its all triggered because of this:
cursor_offset_on_selection: self.mode.is_visual() || self.mode.is_helix(),
Contributor
There was a problem hiding this comment.
Indeed, I probably wasn't using the right sequence, I can see the difference with main now.
tomhoule
approved these changes
Jun 5, 2026
tomhoule
left a comment
tomhoule
left a comment
Contributor
There was a problem hiding this comment.
This is an improvement, and the implementation makes sense. Thanks for the contribution!
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
Closes zed-industries#55170 Fixes Helix mode undo selection history after `d` deletes the character under an empty cursor. Previously, `d` temporarily expanded the cursor to a one-character selection before deleting, and undo restored that temporary selection. When the deleted character was a newline, pressing `x` after undo selected additional line which was wrong. This preserves the original Helix selection as the undo-restored selection while keeping the existing delete behavior unchanged. 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 - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed Helix mode selecting one extra line after undoing a newline delete Co-authored-by: Tom Houlé <13155277+tomhoule@users.noreply.github.com>
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
Closes zed-industries#55170 Fixes Helix mode undo selection history after `d` deletes the character under an empty cursor. Previously, `d` temporarily expanded the cursor to a one-character selection before deleting, and undo restored that temporary selection. When the deleted character was a newline, pressing `x` after undo selected additional line which was wrong. This preserves the original Helix selection as the undo-restored selection while keeping the existing delete behavior unchanged. 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 - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed Helix mode selecting one extra line after undoing a newline delete Co-authored-by: Tom Houlé <13155277+tomhoule@users.noreply.github.com>
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
Closes zed-industries#55170 Fixes Helix mode undo selection history after `d` deletes the character under an empty cursor. Previously, `d` temporarily expanded the cursor to a one-character selection before deleting, and undo restored that temporary selection. When the deleted character was a newline, pressing `x` after undo selected additional line which was wrong. This preserves the original Helix selection as the undo-restored selection while keeping the existing delete behavior unchanged. 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 - [x] Performance impact has been considered and is acceptable Release Notes: - Fixed Helix mode selecting one extra line after undoing a newline delete Co-authored-by: Tom Houlé <13155277+tomhoule@users.noreply.github.com>
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
4 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.
Closes #55170
Fixes Helix mode undo selection history after
ddeletes the character under an empty cursor. Previously,dtemporarily expanded the cursor to a one-character selection before deleting, and undo restored that temporary selection. When the deleted character was a newline, pressingxafter undo selected additional line which was wrong.This preserves the original Helix selection as the undo-restored selection while keeping the existing delete behavior unchanged.
Self-Review Checklist:
Release Notes: