Skip to content

editor: Sticky diff hunk controls#49260

Merged
Veykril merged 1 commit intomainfrom
push-kzuxwqkklxrp
Feb 16, 2026
Merged

editor: Sticky diff hunk controls#49260
Veykril merged 1 commit intomainfrom
push-kzuxwqkklxrp

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Feb 16, 2026

Release Notes:

  • Diff hunk controls now stick to the top of the editor viewport if the top part of the hunk is outside the viewport

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 16, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 16, 2026
@Veykril Veykril enabled auto-merge (squash) February 16, 2026 13:06
@Veykril Veykril merged commit 01b1d7d into main Feb 16, 2026
37 checks passed
@Veykril Veykril deleted the push-kzuxwqkklxrp branch February 16, 2026 13:17
rtfeldman pushed a commit that referenced this pull request Feb 17, 2026
@Veykril @rtfeldman
editor: Sticky diff hunk controls (#49260)
1191b23 
Release Notes:

- Diff hunk controls now stick to the top of the editor viewport if the
top part of the hunk is outside the viewport
ConradIrwin added a commit that referenced this pull request Feb 26, 2026
@ConradIrwin
Fix panic in diff hunk rendering
afd9c59 
When row_infos.is_empty() (if you have very very tiny editors) we could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F

Updates  #49260
@ConradIrwin ConradIrwin mentioned this pull request Feb 26, 2026
Merged
3 tasks
ConradIrwin added a commit that referenced this pull request Feb 26, 2026
@ConradIrwin
Fix panic in diff hunk rendering (#50163)
8453286 
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors
github-actions bot pushed a commit that referenced this pull request Feb 26, 2026
@ConradIrwin
Fix panic in diff hunk rendering (#50163)
68ce0ee 
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors
@zed-zippy zed-zippy bot mentioned this pull request Feb 26, 2026
Merged
3 tasks
github-actions bot pushed a commit that referenced this pull request Feb 26, 2026
@ConradIrwin
Fix panic in diff hunk rendering (#50163)
6021fd8 
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors
@zed-zippy zed-zippy bot mentioned this pull request Feb 26, 2026
Merged
3 tasks
zed-zippy bot added a commit that referenced this pull request Feb 26, 2026
@zed-zippy @ConradIrwin
Fix panic in diff hunk rendering (#50163) (cherry-pick to preview) (#…
233bc4d 
…50164)

Cherry-pick of #50163 to preview

----
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
zed-zippy bot added a commit that referenced this pull request Feb 26, 2026
@zed-zippy @ConradIrwin
Fix panic in diff hunk rendering (#50163) (cherry-pick to stable) (#5…
1d8bdf6 
…0165)

Cherry-pick of #50163 to stable

----
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI

checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
rtfeldman pushed a commit that referenced this pull request Feb 27, 2026
@ConradIrwin
Fix panic in diff hunk rendering (#50163)
aace380 
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  #49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
@ConradIrwin @tahayvr
Fix panic in diff hunk rendering (zed-industries#50163)
f2710d8 
When `row_infos.is_empty()` (if you have very very tiny editors) we
could
end up trying to read the first item out of it.

Fixes ZED-5AT
Fixes ZED-54F
Fixes ZED-56N

Updates  zed-industries#49260

cc @Veykril

Before you mark this PR as ready for review, make sure that you have:
- [ ] Added a solid test coverage and/or screenshots from doing manual
testing
- [ ] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)

Release Notes:

- Fixed a panic rendering diff hunk headers in 0-height editors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Veykril