multi_buffer: Reduce region clones (#48025)
Release Notes: - N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Lukas Wirth authored and GitHub committed
1 parent
d965d552e6
commit
f7bc43c0eb
1 file changed
+33
-23
@@ -35,7 +35,7 @@ use smol::future::yield_now;
|
||||
use std::{
|
||||
any::type_name,
|
||||
borrow::Cow,
|
||||
cell::{Cell, Ref, RefCell},
|
||||
cell::{Cell, OnceCell, Ref, RefCell},
|
||||
cmp, fmt,
|
||||
future::Future,
|
||||
io,
|
||||
@@ -1036,7 +1036,7 @@ struct MultiBufferCursor<'a, MBD, BD> {
|
||||
excerpts: Cursor<'a, 'static, Excerpt, ExcerptDimension<MBD>>,
|
||||
diff_transforms: Cursor<'a, 'static, DiffTransform, DiffTransforms<MBD>>,
|
||||
diffs: &'a TreeMap<BufferId, DiffStateSnapshot>,
|
||||
cached_region: Option<MultiBufferRegion<'a, MBD, BD>>,
|
||||
cached_region: OnceCell<Option<MultiBufferRegion<'a, MBD, BD>>>,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
@@ -1476,6 +1476,7 @@ impl MultiBuffer {
|
||||
continue;
|
||||
}
|
||||
|
||||
let start_region = start_region.clone();
|
||||
if range.end > start_region.range.end {
|
||||
cursor.seek_forward(&range.end);
|
||||
}
|
||||
@@ -1534,10 +1535,11 @@ impl MultiBuffer {
|
||||
excerpt_id: start_region.excerpt.id,
|
||||
});
|
||||
}
|
||||
let excerpt_id = end_region.excerpt.id;
|
||||
if end_region.buffer.capability == Capability::ReadWrite
|
||||
&& end_region.is_main_buffer
|
||||
{
|
||||
edited_excerpt_ids.push(end_region.excerpt.id);
|
||||
edited_excerpt_ids.push(excerpt_id);
|
||||
buffer_edits
|
||||
.entry(end_region.buffer.remote_id())
|
||||
.or_default()
|
||||
@@ -1546,14 +1548,14 @@ impl MultiBuffer {
|
||||
new_text: new_text.clone(),
|
||||
is_insertion: false,
|
||||
original_indent_column,
|
||||
excerpt_id: end_region.excerpt.id,
|
||||
excerpt_id,
|
||||
});
|
||||
}
|
||||
|
||||
cursor.seek(&range.start);
|
||||
cursor.next_excerpt();
|
||||
while let Some(region) = cursor.region() {
|
||||
if region.excerpt.id == end_region.excerpt.id {
|
||||
if region.excerpt.id == excerpt_id {
|
||||
break;
|
||||
}
|
||||
if region.buffer.capability == Capability::ReadWrite && region.is_main_buffer {
|
||||
@@ -1562,7 +1564,7 @@ impl MultiBuffer {
|
||||
.entry(region.buffer.remote_id())
|
||||
.or_default()
|
||||
.push(BufferEdit {
|
||||
range: region.buffer_range,
|
||||
range: region.buffer_range.clone(),
|
||||
new_text: new_text.clone(),
|
||||
is_insertion: false,
|
||||
original_indent_column,
|
||||
@@ -3965,8 +3967,9 @@ impl MultiBufferSnapshot {
|
||||
{
|
||||
return None;
|
||||
}
|
||||
let excerpt = region.excerpt;
|
||||
cursor.next_excerpt();
|
||||
Some(region.excerpt)
|
||||
Some(excerpt)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -4245,7 +4248,7 @@ impl MultiBufferSnapshot {
|
||||
cursor.next();
|
||||
}
|
||||
}
|
||||
let start_region = cursor.region()?;
|
||||
let start_region = cursor.region()?.clone();
|
||||
while let Some(region) = cursor.region() {
|
||||
if region.is_main_buffer
|
||||
&& (region.buffer_range.end > metadata_buffer_range.end
|
||||
@@ -5697,7 +5700,7 @@ impl MultiBufferSnapshot {
|
||||
excerpts,
|
||||
diff_transforms,
|
||||
diffs: &self.diffs,
|
||||
cached_region: None,
|
||||
cached_region: OnceCell::new(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5769,7 +5772,7 @@ impl MultiBufferSnapshot {
|
||||
} else {
|
||||
cursor.seek_to_start_of_current_excerpt();
|
||||
}
|
||||
let mut prev_region = cursor.region();
|
||||
let mut prev_region = cursor.region().cloned();
|
||||
|
||||
cursor.next_excerpt();
|
||||
|
||||
@@ -5779,7 +5782,7 @@ impl MultiBufferSnapshot {
|
||||
return None;
|
||||
}
|
||||
|
||||
let next_region = cursor.region()?;
|
||||
let next_region = cursor.region()?.clone();
|
||||
cursor.next_excerpt();
|
||||
if !bounds.contains(&next_region.range.start.key) {
|
||||
prev_region = Some(next_region);
|
||||
@@ -6010,6 +6013,7 @@ impl MultiBufferSnapshot {
|
||||
cursor.next();
|
||||
region = cursor.region()?;
|
||||
}
|
||||
let region = cursor.region()?;
|
||||
let overshoot = start_row.0.saturating_sub(region.range.start.row);
|
||||
let buffer_start_row =
|
||||
(region.buffer_range.start.row + overshoot).min(region.buffer_range.end.row);
|
||||
@@ -6025,10 +6029,13 @@ impl MultiBufferSnapshot {
|
||||
let line_indents = region
|
||||
.buffer
|
||||
.line_indents_in_row_range(buffer_start_row..buffer_end_row);
|
||||
let region_buffer_row = region.buffer_range.start.row;
|
||||
let region_row = region.range.start.row;
|
||||
let region_buffer = ®ion.excerpt.buffer;
|
||||
cursor.next();
|
||||
Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
|
||||
(MultiBufferRow(row), indent, ®ion.excerpt.buffer)
|
||||
let row = region_row + (buffer_row - region_buffer_row);
|
||||
(MultiBufferRow(row), indent, region_buffer)
|
||||
}))
|
||||
})
|
||||
.flatten()
|
||||
@@ -6048,6 +6055,7 @@ impl MultiBufferSnapshot {
|
||||
cursor.prev();
|
||||
region = cursor.region()?;
|
||||
}
|
||||
let region = cursor.region()?;
|
||||
|
||||
let buffer_start_row = region.buffer_range.start.row;
|
||||
let buffer_end_row = if region.is_main_buffer
|
||||
@@ -6065,10 +6073,13 @@ impl MultiBufferSnapshot {
|
||||
let line_indents = region
|
||||
.buffer
|
||||
.reversed_line_indents_in_row_range(buffer_start_row..buffer_end_row);
|
||||
let region_buffer_row = region.buffer_range.start.row;
|
||||
let region_row = region.range.start.row;
|
||||
let region_buffer = ®ion.excerpt.buffer;
|
||||
cursor.prev();
|
||||
Some(line_indents.map(move |(buffer_row, indent)| {
|
||||
let row = region.range.start.row + (buffer_row - region.buffer_range.start.row);
|
||||
(MultiBufferRow(row), indent, ®ion.excerpt.buffer)
|
||||
let row = region_row + (buffer_row - region_buffer_row);
|
||||
(MultiBufferRow(row), indent, region_buffer)
|
||||
}))
|
||||
})
|
||||
.flatten()
|
||||
@@ -7060,11 +7071,10 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
fn region(&mut self) -> Option<MultiBufferRegion<'a, MBD, BD>> {
|
||||
if self.cached_region.is_none() {
|
||||
self.cached_region = self.build_region();
|
||||
}
|
||||
self.cached_region.clone()
|
||||
fn region(&self) -> Option<&MultiBufferRegion<'a, MBD, BD>> {
|
||||
self.cached_region
|
||||
.get_or_init(|| self.build_region())
|
||||
.as_ref()
|
||||
}
|
||||
|
||||
fn is_at_start_of_excerpt(&mut self) -> bool {
|
||||
@@ -7083,7 +7093,7 @@ where
|
||||
})
|
||||
}
|
||||
|
||||
fn is_at_end_of_excerpt(&mut self) -> bool {
|
||||
fn is_at_end_of_excerpt(&self) -> bool {
|
||||
if self.diff_transforms.end().excerpt_dimension < self.excerpts.end() {
|
||||
return false;
|
||||
} else if self.diff_transforms.end().excerpt_dimension > self.excerpts.end()
|
||||
@@ -7823,11 +7833,11 @@ impl Iterator for MultiBufferRows<'_> {
|
||||
});
|
||||
}
|
||||
|
||||
let mut region = self.cursor.region()?;
|
||||
let mut region = self.cursor.region()?.clone();
|
||||
while self.point >= region.range.end {
|
||||
self.cursor.next();
|
||||
if let Some(next_region) = self.cursor.region() {
|
||||
region = next_region;
|
||||
region = next_region.clone();
|
||||
} else if self.point == self.cursor.diff_transforms.end().output_dimension.0 {
|
||||
let multibuffer_row = MultiBufferRow(self.point.row);
|
||||
let last_excerpt = self
|
||||
|
||||
Reference in new issue
Block a user