Skip to content

git: Mitigate panic in split diff spacer calculation #49674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cole-miller merged 1 commit into from
Feb 20, 2026
Merged

git: Mitigate panic in split diff spacer calculation #49674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions crates/editor/src/display_map/block_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,11 +1252,6 @@ impl BlockMap {
let mut our_tab_point_cursor = wrap_snapshot.tab_point_cursor();
let mut our_wrap_point_cursor = wrap_snapshot.wrap_point_cursor();

let mut companion_inlay_point_cursor = companion_snapshot.inlay_point_cursor();
let mut companion_fold_point_cursor = companion_snapshot.fold_point_cursor();
let mut companion_tab_point_cursor = companion_snapshot.tab_point_cursor();
let mut companion_wrap_point_cursor = companion_snapshot.wrap_point_cursor();

let mut our_wrapper = |our_point: Point, bias: Bias| {
our_wrap_point_cursor
.map(our_tab_point_cursor.map(
Expand All @@ -1265,14 +1260,14 @@ impl BlockMap {
.row()
};
let mut companion_wrapper = |their_point: Point, bias: Bias| {
companion_wrap_point_cursor
.map(
companion_tab_point_cursor.map(
companion_fold_point_cursor
.map(companion_inlay_point_cursor.map(their_point, bias), bias),
),
)
.row()
// TODO(split-diff) fix companion points being passed in decreasing order
let inlay_point = companion_snapshot
.inlay_snapshot
.inlay_point_cursor()
.map(their_point, bias);
let fold_point = companion_snapshot.to_fold_point(inlay_point, bias);
let tab_point = companion_snapshot.fold_point_to_tab_point(fold_point);
companion_snapshot.tab_point_to_wrap_point(tab_point).row()
};
fn determine_spacer(
our_wrapper: &mut dyn FnMut(Point, Bias) -> WrapRow,
Expand Down