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

Fix fold-related panic (#4008)

Browse source 
Although it's not super clear why this fails; in zed1 we used to have a
bounds
check. Restoring the bounds check for now, but leaving a debug_assert!
in case
a local reproduction happens.

Release Notes:

- Fix a panic that happened sometimes when rendering folds
This commit is contained in:
Conrad Irwin 2024-01-10 16:53:25 -07:00 • committed by GitHub
commit b907f375a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -878,16 +878,23 @@ impl EditorElement {
let fold_corner_radius = 0.15 * layout.position_map.line_height; let fold_corner_radius = 0.15 * layout.position_map.line_height;
cx.with_element_id(Some("folds"), |cx| { cx.with_element_id(Some("folds"), |cx| {
let snapshot = &layout.position_map.snapshot; let snapshot = &layout.position_map.snapshot;
for fold in snapshot.folds_in_range(layout.visible_anchor_range.clone()) { for fold in snapshot.folds_in_range(layout.visible_anchor_range.clone()) {
let fold_range = fold.range.clone(); let fold_range = fold.range.clone();
let display_range = fold.range.start.to_display_point(&snapshot) let display_range = fold.range.start.to_display_point(&snapshot)
..fold.range.end.to_display_point(&snapshot); ..fold.range.end.to_display_point(&snapshot);
debug_assert_eq!(display_range.start.row(), display_range.end.row()); debug_assert_eq!(display_range.start.row(), display_range.end.row());
let row = display_range.start.row(); let row = display_range.start.row();
debug_assert!(row < layout.visible_display_row_range.end);
let Some(line_layout) = &layout
.position_map
.line_layouts
.get((row - layout.visible_display_row_range.start) as usize)
.map(|l| &l.line)
else {
continue;
};
let line_layout = &layout.position_map.line_layouts
[(row - layout.visible_display_row_range.start) as usize]
.line;
let start_x = content_origin.x let start_x = content_origin.x
+ line_layout.x_for_index(display_range.start.column() as usize) + line_layout.x_for_index(display_range.start.column() as usize)
- layout.position_map.scroll_position.x; - layout.position_map.scroll_position.x;