vim: Fix cw with count greater than 1 not preserving whitespace correctly #56585
Merged
Conversation
zed-community-bot
Bot
added
the
first contribution
maxdeviant
changed the title
cw with count greater than 1 not preserving whitespace correctly cw with count greater than 1 not preserving whitespace correctly
cla-bot
Bot
added
the
cla-signed
dinocosta
approved these changes
Jun 18, 2026
weihuoya
pushed a commit
to weihuoya/zed
that referenced
this pull request
Jun 25, 2026
…rectly (zed-industries#56585) In vim, `c {count} w` diverges from the default `w` motion behavior: For change operations, the `w` motion will be treated like the `e` motion if the cursor is on a word, preserving whitespace after the N-th word. In zed, this special case was only implemented for a count of 1, falling back to incorrectly using the `w` motion if the count is greater than 1. This PR generalizes this implementation to handle this special case for any count. 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 Closes zed-industries#56563. Release Notes: - Fixed: vim `cw` with count greater than 1 not preserving whitespace correctly --------- Co-authored-by: dino <dinojoaocosta@gmail.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
3 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.
In vim,
c {count} wdiverges from the defaultwmotion behavior: For change operations, thewmotion will be treated like theemotion if the cursor is on a word, preserving whitespace after the N-th word. In zed, this special case was only implemented for a count of 1, falling back to incorrectly using thewmotion if the count is greater than 1.This PR generalizes this implementation to handle this special case for any count.
Self-Review Checklist:
Closes #56563.
Release Notes:
cwwith count greater than 1 not preserving whitespace correctly