editor: Fix relative line numbering with deleted blocks present#49656
Merged
MrSubidubi merged 2 commits intomainfrom Feb 19, 2026
Merged
editor: Fix relative line numbering with deleted blocks present#49656MrSubidubi merged 2 commits intomainfrom
MrSubidubi merged 2 commits intomainfrom
Conversation
Member
Author
|
/cherry-pick preview |
github-actions bot
pushed a commit
that referenced
this pull request
Feb 19, 2026
This tackles another issue where we would incorrectly show two absolute line numbers with relative line numbering enabled when it really should only have been the current active line number. Sadly, no tests rn for this as we would need a better test infra for that to properly catch/test this bug. But with the refactored logic, I think this is easier to understand at glance, so at least theres that Release Notes: - Fixed an issue with relative line numbers where some rows would be missing their relative line number with deleted hunks showing.
github-actions bot
pushed a commit
that referenced
this pull request
Feb 19, 2026
This tackles another issue where we would incorrectly show two absolute line numbers with relative line numbering enabled when it really should only have been the current active line number. Sadly, no tests rn for this as we would need a better test infra for that to properly catch/test this bug. But with the refactored logic, I think this is easier to understand at glance, so at least theres that Release Notes: - Fixed an issue with relative line numbers where some rows would be missing their relative line number with deleted hunks showing.
zed-zippy bot
added a commit
that referenced
this pull request
Feb 19, 2026
…) (cherry-pick to preview) (#49657) Cherry-pick of #49656 to preview ---- This tackles another issue where we would incorrectly show two absolute line numbers with relative line numbering enabled when it really should only have been the current active line number. Sadly, no tests rn for this as we would need a better test infra for that to properly catch/test this bug. But with the refactored logic, I think this is easier to understand at glance, so at least theres that Release Notes: - Fixed an issue with relative line numbers where some rows would be missing their relative line number with deleted hunks showing. Co-authored-by: Finn Evers <finn@zed.dev>
zed-zippy bot
added a commit
that referenced
this pull request
Feb 19, 2026
…) (cherry-pick to stable) (#49658) Cherry-pick of #49656 to stable ---- This tackles another issue where we would incorrectly show two absolute line numbers with relative line numbering enabled when it really should only have been the current active line number. Sadly, no tests rn for this as we would need a better test infra for that to properly catch/test this bug. But with the refactored logic, I think this is easier to understand at glance, so at least theres that Release Notes: - Fixed an issue with relative line numbers where some rows would be missing their relative line number with deleted hunks showing. Co-authored-by: Finn Evers <finn@zed.dev>
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
1 participant
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.
This tackles another issue where we would incorrectly show two absolute line numbers with relative line numbering enabled when it really should only have been the current active line number.
Sadly, no tests rn for this as we would need a better test infra for that to properly catch/test this bug. But with the refactored logic, I think this is easier to understand at glance, so at least theres that
Release Notes: