vim: Fix increment/decrement for negative numbers without gaps - #58327
Merged
Conversation
vim treats `.` as a separator rather than a decimal point, so ctrl-a/ctrl-x act on the digit run under the cursor without requiring whitespace around it. Previously the forward scan only terminated at a dot when it was followed by a non-digit, so on `0.8|1.46` it skipped past `81` to `46`. Terminate whenever the cursor is on the current number so version strings increment the expected part. Release Notes: - Fixed vim ctrl-a/ctrl-x skipping the number under the cursor in dotted strings like version numbers (e.g. `0.81.46`)
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
first contribution
maxdeviant
changed the title
* Move increment-related tests specifically for versions numbers to the existing `test_increment_with_dot` test * Consolidate both `test_increment_negative_numbers_no_gaps` and `test_increment_negative_numbers_on_hyphens` into a single `test_increment_negative_numbers`
Member
Not entirely sure about the details of that issue, but I believe the changes in this Pull Request are good to go as is and likely don't need to wait for that 🫡 |
dinocosta
enabled auto-merge
June 3, 2026 11:25
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
…ndustries#58327) Finally continuing from PR zed-industries#35200: I adapted the fix to the changed find_target() logic and added more tests for version strings like `0.82.46`. This is a different but similar fix compared to zed-industries#47356 for helix mode - not sure if this can and should be unified? 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) (should not affect UI at all) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#35193 Release Notes: - Fixed vim's increment (`ctrl-a`) and decrement (`ctrl-x`) commands skipping the number under the cursor in dotted strings like version numbers (e.g. `0.81.46`) and hyphened date strings (e.g. `2015-02-01`) --------- Co-authored-by: Stefan Bethge <kjyv@users.noreply.github.com> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> Co-authored-by: dino <dinojoaocosta@gmail.com>
This was referenced Jun 10, 2026
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
…ndustries#58327) Finally continuing from PR zed-industries#35200: I adapted the fix to the changed find_target() logic and added more tests for version strings like `0.82.46`. This is a different but similar fix compared to zed-industries#47356 for helix mode - not sure if this can and should be unified? 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) (should not affect UI at all) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#35193 Release Notes: - Fixed vim's increment (`ctrl-a`) and decrement (`ctrl-x`) commands skipping the number under the cursor in dotted strings like version numbers (e.g. `0.81.46`) and hyphened date strings (e.g. `2015-02-01`) --------- Co-authored-by: Stefan Bethge <kjyv@users.noreply.github.com> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com> 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.
Finally continuing from PR #35200:
I adapted the fix to the changed find_target() logic and added more tests for version strings like
0.82.46.This is a different but similar fix compared to #47356 for helix mode - not sure if this can and should be unified?
Self-Review Checklist:
Closes #35193
Release Notes:
ctrl-a) and decrement (ctrl-x) commands skipping the number under the cursor in dotted strings like version numbers (e.g.0.81.46) and hyphened date strings (e.g.2015-02-01)