Fix perf problem with scrollbars in large multibuffers (#2505)

Remove scrollbars from multibuffers

Release Notes:

* Removes git scrollbar highlights from multibuffers (preview only)
This commit is contained in:
Mikayla Maki 2023-05-22 11:11:27 -07:00 committed by GitHub
commit 85266131cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 49 deletions

View File

@ -526,11 +526,8 @@ pub struct EditorSnapshot {
}
impl EditorSnapshot {
fn has_scrollbar_info(&self) -> bool {
self.buffer_snapshot
.git_diff_hunks_in_range(0..self.max_point().row())
.next()
.is_some()
fn has_scrollbar_info(&self, is_singleton: bool) -> bool {
is_singleton && self.buffer_snapshot.has_git_diffs()
}
}

View File

@ -1052,6 +1052,7 @@ impl EditorElement {
..Default::default()
});
if layout.is_singleton {
let diff_style = theme::current(cx).editor.diff.clone();
for hunk in layout
.position_map
@ -1098,6 +1099,7 @@ impl EditorElement {
corner_radius: style.thumb.corner_radius,
})
}
}
scene.push_quad(Quad {
bounds: thumb_bounds,
@ -2067,7 +2069,8 @@ impl Element<Editor> for EditorElement {
let show_scrollbars = match settings::get::<EditorSettings>(cx).show_scrollbars {
ShowScrollbars::Auto => {
snapshot.has_scrollbar_info() || editor.scroll_manager.scrollbars_visible()
snapshot.has_scrollbar_info(is_singleton)
|| editor.scroll_manager.scrollbars_visible()
}
ShowScrollbars::System => editor.scroll_manager.scrollbars_visible(),
ShowScrollbars::Always => true,
@ -2290,6 +2293,7 @@ impl Element<Editor> for EditorElement {
text_size,
scrollbar_row_range,
show_scrollbars,
is_singleton,
max_row,
gutter_margin,
active_rows,
@ -2445,6 +2449,7 @@ pub struct LayoutState {
selections: Vec<(ReplicaId, Vec<SelectionLayout>)>,
scrollbar_row_range: Range<f32>,
show_scrollbars: bool,
is_singleton: bool,
max_row: u32,
context_menu: Option<(DisplayPoint, AnyElement<Editor>)>,
code_actions_indicator: Option<(u32, AnyElement<Editor>)>,

View File

@ -2841,6 +2841,15 @@ impl MultiBufferSnapshot {
})
}
pub fn has_git_diffs(&self) -> bool {
for excerpt in self.excerpts.iter() {
if !excerpt.buffer.git_diff.is_empty() {
return true;
}
}
false
}
pub fn git_diff_hunks_in_range_rev<'a>(
&'a self,
row_range: Range<u32>,

View File

@ -71,6 +71,10 @@ impl BufferDiff {
}
}
pub fn is_empty(&self) -> bool {
self.tree.is_empty()
}
pub fn hunks_in_row_range<'a>(
&'a self,
range: Range<u32>,