Add helix match surround operations#44317
Merged
kubkon merged 4 commits intozed-industries:mainfrom Jan 6, 2026
Merged
Conversation
8d15b23 to
3ee714f
Compare
83b0da3 to
9bb99c1
Compare
kubkon
requested changes
Jan 5, 2026
Member
kubkon
left a comment
There was a problem hiding this comment.
Thanks for the PR and all in all it looks great! I do have two suggestions I would like to fix before landing this PR. Lemme know what you think!
crates/vim/src/helix/surround.rs
Outdated
Comment on lines
+94
to
+97
| let start_anchor = display_map.buffer_snapshot().anchor_before(start); | ||
| edits.push((end..end, pair.end.clone())); | ||
| edits.push((start..start, pair.start.clone())); | ||
| anchors.push(start_anchor..start_anchor); |
Member
There was a problem hiding this comment.
This will force the cursor position to the beginning of the surrounded text whereas I believe that the Helix editor does the opposite - it will place the cursor at the end of the selection:
#[gpui::test]
async fn test_helix_surround_add_cursor_at_closing_bracket(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
cx.enable_helix();
cx.set_state("hello ˇworld", Mode::HelixNormal);
cx.simulate_keystrokes("m s (");
cx.assert_state("hello (wˇ)orld", Mode::HelixNormal);
cx.set_state("hello «worlˇ»d", Mode::HelixNormal);
cx.simulate_keystrokes("m s [");
cx.assert_state("hello [worlˇ]d", Mode::HelixNormal);
}
Comment on lines
+193
to
+202
| let open_start = range.start.to_offset(display_map, Bias::Left); | ||
| let open_end = open_start + open_marker.len_utf8(); | ||
| let close_end = range.end.to_offset(display_map, Bias::Left); | ||
| let close_start = close_end - close_marker.len_utf8(); | ||
|
|
||
| edits.push((close_start..close_end, String::new())); | ||
| edits.push((open_start..open_end, String::new())); | ||
|
|
||
| let anchor = display_map.buffer_snapshot().anchor_before(open_start); | ||
| anchors.push(anchor..anchor); |
Member
There was a problem hiding this comment.
For surround delete/replace, Helix leaves the cursor where it was (minus the deleted surrounding pair), whereas here we also force it to the beginning of modified matched selection:
#[gpui::test]
async fn test_helix_surround_delete_replace_cursor_stays_in_place(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
cx.enable_helix();
cx.set_state("hello (woˇrld) test", Mode::HelixNormal);
cx.simulate_keystrokes("m d (");
cx.assert_state("hello woˇrld test", Mode::HelixNormal);
cx.set_state("hello [woˇrld] test", Mode::HelixNormal);
cx.simulate_keystrokes("m d m");
cx.assert_state("hello woˇrld test", Mode::HelixNormal);
cx.set_state("hello (woˇrld) test", Mode::HelixNormal);
cx.simulate_keystrokes("m r ( [");
cx.assert_state("hello [woˇrld] test", Mode::HelixNormal);
cx.set_state("hello {woˇrld} test", Mode::HelixNormal);
cx.simulate_keystrokes("m r m (");
cx.assert_state("hello (woˇrld) test", Mode::HelixNormal);
}9bb99c1 to
7a440ea
Compare
# Conflicts: # assets/keymaps/vim.json
7a440ea to
d2df8a0
Compare
Contributor
Author
|
Correct - should be addressed, thank you! |
kubkon
approved these changes
Jan 6, 2026
Member
kubkon
left a comment
There was a problem hiding this comment.
Looks great! Thanks for following up with fixes!
rtfeldman
pushed a commit
that referenced
this pull request
Jan 6, 2026
Partially addresses #38151 Release Notes: - Added Helix match surround operations
LivioGama
pushed a commit
to LivioGama/zed
that referenced
this pull request
Jan 20, 2026
Partially addresses zed-industries#38151 Release Notes: - Added Helix match surround operations
LivioGama
pushed a commit
to LivioGama/zed
that referenced
this pull request
Jan 20, 2026
Partially addresses zed-industries#38151 Release Notes: - Added Helix match surround operations
LivioGama
pushed a commit
to LivioGama/zed
that referenced
this pull request
Feb 15, 2026
Partially addresses zed-industries#38151 Release Notes: - Added Helix match surround operations
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.
Partially addresses #38151
Release Notes:
Implements Helix-style surround operations under the
m(match) menu:ms<char>- Add surrounding characters around selectionmr<from><to>- Replace surrounding charactersmd<char>- Delete surrounding charactersIt supports Helix'
mas a special target character meaning "match nearest surrounding pair", allowing operations likemdm(delete nearest surround) andmrm<char>(replace nearest surround).It also adds the concept of a
SurroundPairas a single source of truth for all supported surround characters (brackets and quotes), used by both Vim and Helix flows.surround_pair_for_char_vim,bracket_pair_for_str_vim) keep aliasing (b/B/r/a) while rejecting unknown characters.surround_pair_for_char_helix,bracket_pair_for_str_helix) avoid aliases and treat unknown characters as symmetric pairs.Note
helix/surround.rsassurround.rsexists already.SurroundPairabstraction seemed like a good idea but is definitely not required.