Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid subtraction overflow when excerpt primary is outside of excerpt… (#24213)

Browse source 
This fixes a "subtract with overflow" error that could happen in debug
mode when viewing the project diagnostics.

From git bisecting, I think that this behavior was introduced by
https://github.com/zed-industries/zed/pull/21942. It seems like it's
possible in some cases for the excerpt-expansion heuristic to cause the
excerpt's `context` range to start *after* the excerpt's `primary`
range. We should probably revisit that heuristic at some point, but it
also seems reasonable to handle that situation at this layer, rather
than overflowing.

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2025-02-04 10:24:05 -08:00 • committed by GitHub
parent 4ab4e87266
commit 27d1c689cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/editor/src/element.rs
View file

@ -5801,14 +5801,14 @@ fn header_jump_data(
let excerpt_start = range.context.start; let excerpt_start = range.context.start;
let jump_position = language::ToPoint::to_point(&jump_anchor, buffer); let jump_position = language::ToPoint::to_point(&jump_anchor, buffer);
let offset_from_excerpt_start = if jump_anchor == excerpt_start { let rows_from_excerpt_start = if jump_anchor == excerpt_start {
0 0
} else { } else {
let excerpt_start_row = language::ToPoint::to_point(&excerpt_start, buffer).row; let excerpt_start_point = language::ToPoint::to_point(&excerpt_start, buffer);
jump_position.row - excerpt_start_row jump_position.row.saturating_sub(excerpt_start_point.row)
}; };
let line_offset_from_top = (block_row_start.0 + height + offset_from_excerpt_start) let line_offset_from_top = (block_row_start.0 + height + rows_from_excerpt_start)
.saturating_sub( .saturating_sub(
snapshot snapshot
.scroll_anchor .scroll_anchor
@ -5819,7 +5819,7 @@ fn header_jump_data(
JumpData::MultiBufferPoint { JumpData::MultiBufferPoint {
excerpt_id: for_excerpt.id, excerpt_id: for_excerpt.id,
anchor: jump_anchor, anchor: jump_anchor,
position: language::ToPoint::to_point(&jump_anchor, buffer), position: jump_position,
line_offset_from_top, line_offset_from_top,
} }
} }