mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-26 10:40:54 +00:00
Consolidate calculation of editor's visible row range
We think this will fix a panic that was occuring in `paint_highlighted_range` due to an out-of-bounds read into the line layouts. We think doing essentially the same calculation in two different ways with floating point numbers might have caused a different end row to be calculated in 2 different code paths. Co-authored-by: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
parent
ad6f9b2499
commit
864020463f
1 changed files with 9 additions and 10 deletions
|
@ -675,10 +675,8 @@ impl EditorElement {
|
||||||
let style = &self.style;
|
let style = &self.style;
|
||||||
let local_replica_id = view.replica_id(cx);
|
let local_replica_id = view.replica_id(cx);
|
||||||
let scroll_position = layout.position_map.snapshot.scroll_position();
|
let scroll_position = layout.position_map.snapshot.scroll_position();
|
||||||
let start_row = scroll_position.y() as u32;
|
let start_row = layout.visible_display_row_range.start;
|
||||||
let scroll_top = scroll_position.y() * layout.position_map.line_height;
|
let scroll_top = scroll_position.y() * layout.position_map.line_height;
|
||||||
let end_row =
|
|
||||||
((scroll_top + bounds.height()) / layout.position_map.line_height).ceil() as u32 + 1; // Add 1 to ensure selections bleed off screen
|
|
||||||
let max_glyph_width = layout.position_map.em_width;
|
let max_glyph_width = layout.position_map.em_width;
|
||||||
let scroll_left = scroll_position.x() * max_glyph_width;
|
let scroll_left = scroll_position.x() * max_glyph_width;
|
||||||
let content_origin = bounds.origin() + vec2f(layout.gutter_margin, 0.);
|
let content_origin = bounds.origin() + vec2f(layout.gutter_margin, 0.);
|
||||||
|
@ -697,8 +695,6 @@ impl EditorElement {
|
||||||
for (range, color) in &layout.highlighted_ranges {
|
for (range, color) in &layout.highlighted_ranges {
|
||||||
self.paint_highlighted_range(
|
self.paint_highlighted_range(
|
||||||
range.clone(),
|
range.clone(),
|
||||||
start_row,
|
|
||||||
end_row,
|
|
||||||
*color,
|
*color,
|
||||||
0.,
|
0.,
|
||||||
0.15 * layout.position_map.line_height,
|
0.15 * layout.position_map.line_height,
|
||||||
|
@ -719,8 +715,6 @@ impl EditorElement {
|
||||||
for selection in selections {
|
for selection in selections {
|
||||||
self.paint_highlighted_range(
|
self.paint_highlighted_range(
|
||||||
selection.range.clone(),
|
selection.range.clone(),
|
||||||
start_row,
|
|
||||||
end_row,
|
|
||||||
selection_style.selection,
|
selection_style.selection,
|
||||||
corner_radius,
|
corner_radius,
|
||||||
corner_radius * 2.,
|
corner_radius * 2.,
|
||||||
|
@ -734,7 +728,10 @@ impl EditorElement {
|
||||||
|
|
||||||
if view.show_local_cursors() || *replica_id != local_replica_id {
|
if view.show_local_cursors() || *replica_id != local_replica_id {
|
||||||
let cursor_position = selection.head;
|
let cursor_position = selection.head;
|
||||||
if (start_row..end_row).contains(&cursor_position.row()) {
|
if layout
|
||||||
|
.visible_display_row_range
|
||||||
|
.contains(&cursor_position.row())
|
||||||
|
{
|
||||||
let cursor_row_layout = &layout.position_map.line_layouts
|
let cursor_row_layout = &layout.position_map.line_layouts
|
||||||
[(cursor_position.row() - start_row) as usize];
|
[(cursor_position.row() - start_row) as usize];
|
||||||
let cursor_column = cursor_position.column() as usize;
|
let cursor_column = cursor_position.column() as usize;
|
||||||
|
@ -1025,8 +1022,6 @@ impl EditorElement {
|
||||||
fn paint_highlighted_range(
|
fn paint_highlighted_range(
|
||||||
&self,
|
&self,
|
||||||
range: Range<DisplayPoint>,
|
range: Range<DisplayPoint>,
|
||||||
start_row: u32,
|
|
||||||
end_row: u32,
|
|
||||||
color: Color,
|
color: Color,
|
||||||
corner_radius: f32,
|
corner_radius: f32,
|
||||||
line_end_overshoot: f32,
|
line_end_overshoot: f32,
|
||||||
|
@ -1037,6 +1032,8 @@ impl EditorElement {
|
||||||
bounds: RectF,
|
bounds: RectF,
|
||||||
cx: &mut PaintContext,
|
cx: &mut PaintContext,
|
||||||
) {
|
) {
|
||||||
|
let start_row = layout.visible_display_row_range.start;
|
||||||
|
let end_row = layout.visible_display_row_range.end;
|
||||||
if range.start != range.end {
|
if range.start != range.end {
|
||||||
let row_range = if range.end.column() == 0 {
|
let row_range = if range.end.column() == 0 {
|
||||||
cmp::max(range.start.row(), start_row)..cmp::min(range.end.row(), end_row)
|
cmp::max(range.start.row(), start_row)..cmp::min(range.end.row(), end_row)
|
||||||
|
@ -1826,6 +1823,7 @@ impl Element for EditorElement {
|
||||||
em_advance,
|
em_advance,
|
||||||
snapshot,
|
snapshot,
|
||||||
}),
|
}),
|
||||||
|
visible_display_row_range: start_row..end_row,
|
||||||
gutter_size,
|
gutter_size,
|
||||||
gutter_padding,
|
gutter_padding,
|
||||||
text_size,
|
text_size,
|
||||||
|
@ -1971,6 +1969,7 @@ pub struct LayoutState {
|
||||||
gutter_margin: f32,
|
gutter_margin: f32,
|
||||||
text_size: Vector2F,
|
text_size: Vector2F,
|
||||||
mode: EditorMode,
|
mode: EditorMode,
|
||||||
|
visible_display_row_range: Range<u32>,
|
||||||
active_rows: BTreeMap<u32, bool>,
|
active_rows: BTreeMap<u32, bool>,
|
||||||
highlighted_rows: Option<Range<u32>>,
|
highlighted_rows: Option<Range<u32>>,
|
||||||
line_number_layouts: Vec<Option<text_layout::Line>>,
|
line_number_layouts: Vec<Option<text_layout::Line>>,
|
||||||
|
|
Loading…
Reference in a new issue