Skip to content

editor: Fix relative line numbers breaking with nested folds#47035

Merged
MrSubidubi merged 1 commit intomainfrom
fix-it-again
Jan 16, 2026
Merged

editor: Fix relative line numbers breaking with nested folds#47035
MrSubidubi merged 1 commit intomainfrom
fix-it-again

Conversation

@MrSubidubi
Copy link
Member

@MrSubidubi MrSubidubi commented Jan 16, 2026

Closes #46516

The previous fix only worked for non-nested folds, whereas this one also considers nested folds properly. Also makes this more straightforward to read.

Release Notes:

  • Fixed an issue where relative line numbering would break with nested folds.

@MrSubidubi MrSubidubi self-assigned this Jan 16, 2026
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 16, 2026
@MrSubidubi MrSubidubi enabled auto-merge (squash) January 16, 2026 23:42
@MrSubidubi MrSubidubi disabled auto-merge January 16, 2026 23:43
@MrSubidubi MrSubidubi enabled auto-merge (squash) January 16, 2026 23:43
@MrSubidubi MrSubidubi merged commit 10a536b into main Jan 16, 2026
27 checks passed
@MrSubidubi MrSubidubi deleted the fix-it-again branch January 16, 2026 23:56
@MrSubidubi
Copy link
Member Author

/cherry-pick preview

@MrSubidubi
Copy link
Member Author

/cherry-pick stable

github-actions bot pushed a commit that referenced this pull request Jan 18, 2026
Closes #46516

The previous fix only worked for non-nested folds, whereas this one also
considers nested folds properly. Also makes this more straightforward to
read.

Release Notes:

- Fixed an issue where relative line numbering would break with nested
folds.
github-actions bot pushed a commit that referenced this pull request Jan 18, 2026
Closes #46516

The previous fix only worked for non-nested folds, whereas this one also
considers nested folds properly. Also makes this more straightforward to
read.

Release Notes:

- Fixed an issue where relative line numbering would break with nested
folds.
zed-zippy bot added a commit that referenced this pull request Jan 18, 2026
… (cherry-pick to preview) (#47107)

Cherry-pick of #47035 to preview

----
Closes #46516

The previous fix only worked for non-nested folds, whereas this one also
considers nested folds properly. Also makes this more straightforward to
read.

Release Notes:

- Fixed an issue where relative line numbering would break with nested
folds.

Co-authored-by: Finn Evers <finn@zed.dev>
zed-zippy bot added a commit that referenced this pull request Jan 18, 2026
… (cherry-pick to stable) (#47108)

Cherry-pick of #47035 to stable

----
Closes #46516

The previous fix only worked for non-nested folds, whereas this one also
considers nested folds properly. Also makes this more straightforward to
read.

Release Notes:

- Fixed an issue where relative line numbering would break with nested
folds.

Co-authored-by: Finn Evers <finn@zed.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Relative line numbers display incorrect values inside a block with folded blocks and change value arbitrarly when scrolling

1 participant