Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
editor: Limit row highlight expansion to viewport (#63395)
Conrad Irwin3f00b5d75d11
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rsindex 8b6cc7b4249..44699636548 100644--- a/crates/editor/src/editor.rs+++ b/crates/editor/src/editor.rs@@ -9193,7 +9193,7 @@ impl Editor {) -> impl 'a + Iterator<Item = (Range<Anchor>, Hsla)> {self.highlighted_rows.get(&TypeId::of::<T>())- .map_or(&[] as &[_], |vec| vec.as_slice())+ .map_or(&[] as &[_], |highlights| highlights.as_slice()).iter().map(|highlight| (highlight.range.clone(), (highlight.color)(cx)))}@@ -9207,21 +9207,75 @@ impl Editor {cx: &mut App,) -> BTreeMap<DisplayRow, LineHighlight> {let snapshot = self.snapshot(window, cx);+ let max_row = snapshot.max_point().row();+ self.highlighted_display_rows_in_range(+ Anchor::Min..Anchor::Max,+ DisplayRow(0)..max_row.next_row(),+ &snapshot.display_snapshot,+ cx,+ )+ }++ pub fn highlighted_display_rows_in_range(+ &self,+ anchor_range: Range<Anchor>,+ display_row_range: Range<DisplayRow>,+ snapshot: &DisplaySnapshot,+ cx: &App,+ ) -> BTreeMap<DisplayRow, LineHighlight> {+ if display_row_range.is_empty() {+ return BTreeMap::default();+ }++ let buffer_snapshot = snapshot.buffer_snapshot();let mut used_highlight_orders = HashMap::default();self.highlighted_rows.values()- .flat_map(|highlighted_rows| highlighted_rows.iter())+ .flat_map(|highlighted_rows| {+ let start_index = highlighted_rows.partition_point(|highlight| {+ highlight+ .range+ .end+ .cmp(&anchor_range.start, buffer_snapshot)+ .is_lt()+ });+ let end_index = highlighted_rows.partition_point(|highlight| {+ highlight+ .range+ .start+ .cmp(&anchor_range.end, buffer_snapshot)+ .is_le()+ });+ highlighted_rows[start_index..end_index]+ .iter()+ .filter(|highlight| {+ highlight+ .range+ .end+ .cmp(&anchor_range.start, buffer_snapshot)+ .is_ge()+ && highlight+ .range+ .start+ .cmp(&anchor_range.end, buffer_snapshot)+ .is_le()+ })+ }).fold(BTreeMap::<DisplayRow, LineHighlight>::new(),|mut unique_rows, highlight| {- let start = highlight.range.start.to_display_point(&snapshot);- let end = highlight.range.end.to_display_point(&snapshot);- let start_row = start.row().0;- let end_row = if !highlight.range.end.is_max() && end.column() == 0 {+ let start = highlight.range.start.to_display_point(snapshot);+ let end = highlight.range.end.to_display_point(snapshot);+ let start_row = start.row().0.max(display_row_range.start.0);+ let mut end_row = if !highlight.range.end.is_max() && end.column() == 0 {end.row().0.saturating_sub(1)} else {end.row().0};+ end_row = end_row.min(display_row_range.end.0.saturating_sub(1));+ if start_row > end_row {+ return unique_rows;+ }let mut header_rows = snapshot.blocks_in_range(DisplayRow(start_row)..DisplayRow(end_row.saturating_add(1)),diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rsindex b359aa9d580..6e9cfc2620a 100644--- a/crates/editor/src/editor_tests.rs+++ b/crates/editor/src/editor_tests.rs@@ -84,6 +84,108 @@ fn display_ranges(editor: &Editor, cx: &mut Context<'_, Editor>) -> Vec<Range<Di.display_ranges(&editor.display_snapshot(cx))}+#[gpui::test]+fn test_highlighted_display_rows_in_range(cx: &mut TestAppContext) {+ struct FirstHighlight;+ struct SecondHighlight;++ init_test(cx, |_| {});+ let buffer = cx.new(|cx| language::Buffer::local(sample_text(8, 3, 'a'), cx));+ let editor = cx.add_window(|window, cx| Editor::for_buffer(buffer, None, window, cx));++ assert!(+ editor+ .update(cx, |editor, window, cx| {+ let buffer = editor.buffer().read(cx).snapshot(cx);+ editor.highlight_rows::<FirstHighlight>(+ buffer.anchor_before(Point::new(0, 0))..buffer.anchor_before(Point::new(6, 0)),+ |cx| cx.theme().colors().editor_background,+ RowHighlightOptions::default(),+ cx,+ );+ editor.highlight_rows::<SecondHighlight>(+ buffer.anchor_before(Point::new(0, 0))..buffer.anchor_before(Point::new(1, 0)),+ |cx| cx.theme().colors().editor_highlighted_line_background,+ RowHighlightOptions::default(),+ cx,+ );+ editor.highlight_rows::<SecondHighlight>(+ buffer.anchor_before(Point::new(3, 0))..buffer.anchor_before(Point::new(4, 0)),+ |cx| cx.theme().colors().editor_highlighted_line_background,+ RowHighlightOptions::default(),+ cx,+ );+ editor.highlight_rows::<SecondHighlight>(+ buffer.anchor_before(Point::new(6, 0))..buffer.anchor_before(Point::new(7, 0)),+ |cx| cx.theme().colors().editor_highlighted_line_background,+ RowHighlightOptions::default(),+ cx,+ );++ let display_row_range = DisplayRow(2)..DisplayRow(5);+ let expected = editor+ .highlighted_display_rows(window, cx)+ .into_iter()+ .filter(|(row, _)| display_row_range.contains(row))+ .collect::<BTreeMap<_, _>>();+ let snapshot = editor.snapshot(window, cx);+ let actual = editor.highlighted_display_rows_in_range(+ buffer.anchor_before(Point::new(2, 0))..buffer.anchor_before(Point::new(5, 0)),+ display_row_range,+ &snapshot.display_snapshot,+ cx,+ );++ assert_eq!(actual, expected);++ let highlight_start = buffer.anchor_before(Point::new(2, 0));+ let Some(block_id) = editor+ .insert_blocks(+ [BlockProperties {+ style: BlockStyle::Fixed,+ placement: BlockPlacement::Above(highlight_start),+ height: Some(1),+ render: Arc::new(|_| div().into_any()),+ priority: 0,+ }],+ None,+ cx,+ )+ .into_iter()+ .next()+ else {+ panic!("expected an inserted block");+ };+ editor.highlight_rows::<SecondHighlight>(+ highlight_start..buffer.anchor_before(Point::new(4, 0)),+ |cx| cx.theme().colors().editor_highlighted_line_background,+ RowHighlightOptions::default(),+ cx,+ );+ let Some(block_row) = editor.row_for_block(block_id, cx) else {+ panic!("expected an inserted block row");+ };+ let display_row_range = block_row..block_row.next_row();+ let expected = editor+ .highlighted_display_rows(window, cx)+ .into_iter()+ .filter(|(row, _)| display_row_range.contains(row))+ .collect::<BTreeMap<_, _>>();+ let snapshot = editor.snapshot(window, cx);+ let actual = editor.highlighted_display_rows_in_range(+ buffer.anchor_before(Point::new(1, 0))..highlight_start,+ display_row_range,+ &snapshot.display_snapshot,+ cx,+ );++ assert!(!expected.is_empty());+ assert_eq!(actual, expected);+ })+ .is_ok()+ );+}+#[cfg(any(test, feature = "test-support"))]pub mod property_test;diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rsindex e8cd1b4e25a..c6c85605e64 100644--- a/crates/editor/src/element.rs+++ b/crates/editor/src/element.rs@@ -8215,9 +8215,13 @@ impl Element for EditorElement {)};- let mut highlighted_rows = self- .editor- .update(cx, |editor, cx| editor.highlighted_display_rows(window, cx));+ let mut highlighted_rows =+ self.editor.read(cx).highlighted_display_rows_in_range(+ start_anchor..end_anchor,+ start_row..end_row,+ &snapshot.display_snapshot,+ cx,+ );let mut highlighted_ranges = self.editor_with_selections(cx)