editor: Deduplicate sticky header rows (#52844)

Fixes a bug that caused duplicate sticky header rows to appear if
multiple outline items start on the same row.

Sort of addresses #52722, although arguably the real issue there is that
duplicate outline items are being created in the first place.

Before:


https://github.com/user-attachments/assets/7941cbe8-9b62-470c-b475-f08f2f20fac6

After:


https://github.com/user-attachments/assets/c4e291ea-6414-483f-8ff7-3d89d10000b6

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

Release Notes:

- Fixed a bug that caused duplicate sticky header rows to appear if
multiple outline items start on the same row.
This commit is contained in:
Tim Vermeulen 2026-03-31 20:56:49 +02:00 committed by GitHub
parent 89732f1279
commit 3a6faf2b4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 66 additions and 0 deletions

View file

@ -31952,6 +31952,65 @@ async fn test_sticky_scroll_with_expanded_deleted_diff_hunks(
assert_eq!(sticky_headers(6.0), vec![]);
}
#[gpui::test]
async fn test_no_duplicated_sticky_headers(cx: &mut TestAppContext) {
init_test(cx, |_| {});
let mut cx = EditorTestContext::new(cx).await;
cx.set_state(indoc! {"
ˇimpl Foo { fn bar() {
let x = 1;
fn baz() {
let y = 2;
}
} }
"});
cx.update_editor(|e, _, cx| {
e.buffer()
.read(cx)
.as_singleton()
.unwrap()
.update(cx, |buffer, cx| {
buffer.set_language(Some(rust_lang()), cx);
})
});
let mut sticky_headers = |offset: ScrollOffset| {
cx.update_editor(|e, window, cx| {
e.scroll(gpui::Point { x: 0., y: offset }, None, window, cx);
});
cx.run_until_parked();
cx.update_editor(|e, window, cx| {
EditorElement::sticky_headers(&e, &e.snapshot(window, cx))
.into_iter()
.map(
|StickyHeader {
start_point,
offset,
..
}| { (start_point, offset) },
)
.collect::<Vec<_>>()
})
};
let struct_foo = Point { row: 0, column: 0 };
let fn_baz = Point { row: 2, column: 4 };
assert_eq!(sticky_headers(0.0), vec![]);
assert_eq!(sticky_headers(0.5), vec![(struct_foo, 0.0)]);
assert_eq!(sticky_headers(1.0), vec![(struct_foo, 0.0)]);
assert_eq!(sticky_headers(1.5), vec![(struct_foo, 0.0), (fn_baz, 1.0)]);
assert_eq!(sticky_headers(2.0), vec![(struct_foo, 0.0), (fn_baz, 1.0)]);
assert_eq!(sticky_headers(2.5), vec![(struct_foo, 0.0), (fn_baz, 0.5)]);
assert_eq!(sticky_headers(3.0), vec![(struct_foo, 0.0)]);
assert_eq!(sticky_headers(3.5), vec![(struct_foo, 0.0)]);
assert_eq!(sticky_headers(4.0), vec![(struct_foo, 0.0)]);
assert_eq!(sticky_headers(4.5), vec![(struct_foo, -0.5)]);
assert_eq!(sticky_headers(5.0), vec![]);
}
#[gpui::test]
fn test_relative_line_numbers(cx: &mut TestAppContext) {
init_test(cx, |_| {});

View file

@ -4674,6 +4674,13 @@ impl EditorElement {
.display_snapshot
.point_to_display_point(start_point, Bias::Left)
.row();
if rows
.last()
.is_some_and(|last| last.sticky_row == sticky_row)
{
continue;
}
let end_row = snapshot
.display_snapshot
.point_to_display_point(end_point, Bias::Left)