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

edit prediction: Do not render jump cursor until line layout is ready (#24226)

Browse source 
This is pretty rare but I found a case where `line_layouts` didn't have
the requested line yet, so we now skip rendering the cursor for that
period and avoid panicking.

Release Notes:

- N/A
This commit is contained in:
Agus Zubiaga 2025-02-04 17:58:25 -03:00 • committed by GitHub
parent 6f0f9d631e
commit 58db66ef44
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/editor/src/editor.rs
View file

@ -5675,11 +5675,12 @@ impl Editor {
let end_point = range_around_target.end.to_point(&snapshot);
let target_point = target.text_anchor.to_point(&snapshot);
let start_column_x =
line_layouts[start_point.row as usize].x_for_index(start_point.column as usize);
let target_column_x = line_layouts[target_point.row as usize]
.x_for_index(target_point.column as usize);
let cursor_relative_position = target_column_x - start_column_x;
let cursor_relative_position =
line_layouts.get(start_point.row as usize).map(|line| {
let start_column_x = line.x_for_index(start_point.column as usize);
let target_column_x = line.x_for_index(target_point.column as usize);
target_column_x - start_column_x
});
let fade_before = start_point.column > 0;
let fade_after = end_point.column < snapshot.line_len(end_point.row);
@ -5722,15 +5723,17 @@ impl Editor {
),
)
})
.child(
div()
.w(px(2.))
.h_full()
.bg(cursor_color)
.absolute()
.top_0()
.left(cursor_relative_position),
),
.when_some(cursor_relative_position, |parent, position| {
parent.child(
div()
.w(px(2.))
.h_full()
.bg(cursor_color)
.absolute()
.top_0()
.left(position),
)
}),
)
}),
)