8aa5319210
Hopefully this makes it a bit easier for new contributors to dive into the codebase :) Release Notes: - Improved documentation for many core editor types --------- Co-authored-by: Nathan Sobo <nathan@zed.dev>
1749 lines
63 KiB
Rust
1749 lines
63 KiB
Rust
use super::{
|
|
inlay_map::{InlayBufferRows, InlayChunks, InlayEdit, InlayOffset, InlayPoint, InlaySnapshot},
|
|
Highlights,
|
|
};
|
|
use crate::{Anchor, AnchorRangeExt, MultiBufferSnapshot, ToOffset};
|
|
use gpui::{ElementId, HighlightStyle, Hsla};
|
|
use language::{Chunk, Edit, Point, TextSummary};
|
|
use std::{
|
|
any::TypeId,
|
|
cmp::{self, Ordering},
|
|
iter,
|
|
ops::{Add, AddAssign, Deref, DerefMut, Range, Sub},
|
|
};
|
|
use sum_tree::{Bias, Cursor, FilterCursor, SumTree};
|
|
use util::post_inc;
|
|
|
|
#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
|
|
pub struct FoldPoint(pub Point);
|
|
|
|
impl FoldPoint {
|
|
pub fn new(row: u32, column: u32) -> Self {
|
|
Self(Point::new(row, column))
|
|
}
|
|
|
|
pub fn row(self) -> u32 {
|
|
self.0.row
|
|
}
|
|
|
|
pub fn column(self) -> u32 {
|
|
self.0.column
|
|
}
|
|
|
|
pub fn row_mut(&mut self) -> &mut u32 {
|
|
&mut self.0.row
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn column_mut(&mut self) -> &mut u32 {
|
|
&mut self.0.column
|
|
}
|
|
|
|
pub fn to_inlay_point(self, snapshot: &FoldSnapshot) -> InlayPoint {
|
|
let mut cursor = snapshot.transforms.cursor::<(FoldPoint, InlayPoint)>();
|
|
cursor.seek(&self, Bias::Right, &());
|
|
let overshoot = self.0 - cursor.start().0 .0;
|
|
InlayPoint(cursor.start().1 .0 + overshoot)
|
|
}
|
|
|
|
pub fn to_offset(self, snapshot: &FoldSnapshot) -> FoldOffset {
|
|
let mut cursor = snapshot
|
|
.transforms
|
|
.cursor::<(FoldPoint, TransformSummary)>();
|
|
cursor.seek(&self, Bias::Right, &());
|
|
let overshoot = self.0 - cursor.start().1.output.lines;
|
|
let mut offset = cursor.start().1.output.len;
|
|
if !overshoot.is_zero() {
|
|
let transform = cursor.item().expect("display point out of range");
|
|
assert!(transform.output_text.is_none());
|
|
let end_inlay_offset = snapshot
|
|
.inlay_snapshot
|
|
.to_offset(InlayPoint(cursor.start().1.input.lines + overshoot));
|
|
offset += end_inlay_offset.0 - cursor.start().1.input.len;
|
|
}
|
|
FoldOffset(offset)
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, TransformSummary> for FoldPoint {
|
|
fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
|
|
self.0 += &summary.output.lines;
|
|
}
|
|
}
|
|
|
|
pub(crate) struct FoldMapWriter<'a>(&'a mut FoldMap);
|
|
|
|
impl<'a> FoldMapWriter<'a> {
|
|
pub(crate) fn fold<T: ToOffset>(
|
|
&mut self,
|
|
ranges: impl IntoIterator<Item = Range<T>>,
|
|
) -> (FoldSnapshot, Vec<FoldEdit>) {
|
|
let mut edits = Vec::new();
|
|
let mut folds = Vec::new();
|
|
let snapshot = self.0.snapshot.inlay_snapshot.clone();
|
|
for range in ranges.into_iter() {
|
|
let buffer = &snapshot.buffer;
|
|
let range = range.start.to_offset(&buffer)..range.end.to_offset(&buffer);
|
|
|
|
// Ignore any empty ranges.
|
|
if range.start == range.end {
|
|
continue;
|
|
}
|
|
|
|
// For now, ignore any ranges that span an excerpt boundary.
|
|
let fold_range =
|
|
FoldRange(buffer.anchor_after(range.start)..buffer.anchor_before(range.end));
|
|
if fold_range.0.start.excerpt_id != fold_range.0.end.excerpt_id {
|
|
continue;
|
|
}
|
|
|
|
folds.push(Fold {
|
|
id: FoldId(post_inc(&mut self.0.next_fold_id.0)),
|
|
range: fold_range,
|
|
});
|
|
|
|
let inlay_range =
|
|
snapshot.to_inlay_offset(range.start)..snapshot.to_inlay_offset(range.end);
|
|
edits.push(InlayEdit {
|
|
old: inlay_range.clone(),
|
|
new: inlay_range,
|
|
});
|
|
}
|
|
|
|
let buffer = &snapshot.buffer;
|
|
folds.sort_unstable_by(|a, b| sum_tree::SeekTarget::cmp(&a.range, &b.range, buffer));
|
|
|
|
self.0.snapshot.folds = {
|
|
let mut new_tree = SumTree::new();
|
|
let mut cursor = self.0.snapshot.folds.cursor::<FoldRange>();
|
|
for fold in folds {
|
|
new_tree.append(cursor.slice(&fold.range, Bias::Right, buffer), buffer);
|
|
new_tree.push(fold, buffer);
|
|
}
|
|
new_tree.append(cursor.suffix(buffer), buffer);
|
|
new_tree
|
|
};
|
|
|
|
consolidate_inlay_edits(&mut edits);
|
|
let edits = self.0.sync(snapshot.clone(), edits);
|
|
(self.0.snapshot.clone(), edits)
|
|
}
|
|
|
|
pub(crate) fn unfold<T: ToOffset>(
|
|
&mut self,
|
|
ranges: impl IntoIterator<Item = Range<T>>,
|
|
inclusive: bool,
|
|
) -> (FoldSnapshot, Vec<FoldEdit>) {
|
|
let mut edits = Vec::new();
|
|
let mut fold_ixs_to_delete = Vec::new();
|
|
let snapshot = self.0.snapshot.inlay_snapshot.clone();
|
|
let buffer = &snapshot.buffer;
|
|
for range in ranges.into_iter() {
|
|
// Remove intersecting folds and add their ranges to edits that are passed to sync.
|
|
let mut folds_cursor =
|
|
intersecting_folds(&snapshot, &self.0.snapshot.folds, range, inclusive);
|
|
while let Some(fold) = folds_cursor.item() {
|
|
let offset_range =
|
|
fold.range.start.to_offset(buffer)..fold.range.end.to_offset(buffer);
|
|
if offset_range.end > offset_range.start {
|
|
let inlay_range = snapshot.to_inlay_offset(offset_range.start)
|
|
..snapshot.to_inlay_offset(offset_range.end);
|
|
edits.push(InlayEdit {
|
|
old: inlay_range.clone(),
|
|
new: inlay_range,
|
|
});
|
|
}
|
|
fold_ixs_to_delete.push(*folds_cursor.start());
|
|
folds_cursor.next(buffer);
|
|
}
|
|
}
|
|
|
|
fold_ixs_to_delete.sort_unstable();
|
|
fold_ixs_to_delete.dedup();
|
|
|
|
self.0.snapshot.folds = {
|
|
let mut cursor = self.0.snapshot.folds.cursor::<usize>();
|
|
let mut folds = SumTree::new();
|
|
for fold_ix in fold_ixs_to_delete {
|
|
folds.append(cursor.slice(&fold_ix, Bias::Right, buffer), buffer);
|
|
cursor.next(buffer);
|
|
}
|
|
folds.append(cursor.suffix(buffer), buffer);
|
|
folds
|
|
};
|
|
|
|
consolidate_inlay_edits(&mut edits);
|
|
let edits = self.0.sync(snapshot.clone(), edits);
|
|
(self.0.snapshot.clone(), edits)
|
|
}
|
|
}
|
|
|
|
/// Decides where the fold indicators should be; also tracks parts of a source file that are currently folded.
|
|
///
|
|
/// See the [`display_map` module documentation](crate::display_map) for more information.
|
|
pub(crate) struct FoldMap {
|
|
snapshot: FoldSnapshot,
|
|
ellipses_color: Option<Hsla>,
|
|
next_fold_id: FoldId,
|
|
}
|
|
|
|
impl FoldMap {
|
|
pub(crate) fn new(inlay_snapshot: InlaySnapshot) -> (Self, FoldSnapshot) {
|
|
let this = Self {
|
|
snapshot: FoldSnapshot {
|
|
folds: Default::default(),
|
|
transforms: SumTree::from_item(
|
|
Transform {
|
|
summary: TransformSummary {
|
|
input: inlay_snapshot.text_summary(),
|
|
output: inlay_snapshot.text_summary(),
|
|
},
|
|
output_text: None,
|
|
},
|
|
&(),
|
|
),
|
|
inlay_snapshot: inlay_snapshot.clone(),
|
|
version: 0,
|
|
ellipses_color: None,
|
|
},
|
|
ellipses_color: None,
|
|
next_fold_id: FoldId::default(),
|
|
};
|
|
let snapshot = this.snapshot.clone();
|
|
(this, snapshot)
|
|
}
|
|
|
|
pub fn read(
|
|
&mut self,
|
|
inlay_snapshot: InlaySnapshot,
|
|
edits: Vec<InlayEdit>,
|
|
) -> (FoldSnapshot, Vec<FoldEdit>) {
|
|
let edits = self.sync(inlay_snapshot, edits);
|
|
self.check_invariants();
|
|
(self.snapshot.clone(), edits)
|
|
}
|
|
|
|
pub fn write(
|
|
&mut self,
|
|
inlay_snapshot: InlaySnapshot,
|
|
edits: Vec<InlayEdit>,
|
|
) -> (FoldMapWriter, FoldSnapshot, Vec<FoldEdit>) {
|
|
let (snapshot, edits) = self.read(inlay_snapshot, edits);
|
|
(FoldMapWriter(self), snapshot, edits)
|
|
}
|
|
|
|
pub fn set_ellipses_color(&mut self, color: Hsla) -> bool {
|
|
if self.ellipses_color != Some(color) {
|
|
self.ellipses_color = Some(color);
|
|
true
|
|
} else {
|
|
false
|
|
}
|
|
}
|
|
|
|
fn check_invariants(&self) {
|
|
if cfg!(test) {
|
|
assert_eq!(
|
|
self.snapshot.transforms.summary().input.len,
|
|
self.snapshot.inlay_snapshot.len().0,
|
|
"transform tree does not match inlay snapshot's length"
|
|
);
|
|
|
|
let mut folds = self.snapshot.folds.iter().peekable();
|
|
while let Some(fold) = folds.next() {
|
|
if let Some(next_fold) = folds.peek() {
|
|
let comparison = fold
|
|
.range
|
|
.cmp(&next_fold.range, &self.snapshot.inlay_snapshot.buffer);
|
|
assert!(comparison.is_le());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn sync(
|
|
&mut self,
|
|
inlay_snapshot: InlaySnapshot,
|
|
inlay_edits: Vec<InlayEdit>,
|
|
) -> Vec<FoldEdit> {
|
|
if inlay_edits.is_empty() {
|
|
if self.snapshot.inlay_snapshot.version != inlay_snapshot.version {
|
|
self.snapshot.version += 1;
|
|
}
|
|
self.snapshot.inlay_snapshot = inlay_snapshot;
|
|
Vec::new()
|
|
} else {
|
|
let mut inlay_edits_iter = inlay_edits.iter().cloned().peekable();
|
|
|
|
let mut new_transforms = SumTree::new();
|
|
let mut cursor = self.snapshot.transforms.cursor::<InlayOffset>();
|
|
cursor.seek(&InlayOffset(0), Bias::Right, &());
|
|
|
|
while let Some(mut edit) = inlay_edits_iter.next() {
|
|
new_transforms.append(cursor.slice(&edit.old.start, Bias::Left, &()), &());
|
|
edit.new.start -= edit.old.start - *cursor.start();
|
|
edit.old.start = *cursor.start();
|
|
|
|
cursor.seek(&edit.old.end, Bias::Right, &());
|
|
cursor.next(&());
|
|
|
|
let mut delta = edit.new_len().0 as isize - edit.old_len().0 as isize;
|
|
loop {
|
|
edit.old.end = *cursor.start();
|
|
|
|
if let Some(next_edit) = inlay_edits_iter.peek() {
|
|
if next_edit.old.start > edit.old.end {
|
|
break;
|
|
}
|
|
|
|
let next_edit = inlay_edits_iter.next().unwrap();
|
|
delta += next_edit.new_len().0 as isize - next_edit.old_len().0 as isize;
|
|
|
|
if next_edit.old.end >= edit.old.end {
|
|
edit.old.end = next_edit.old.end;
|
|
cursor.seek(&edit.old.end, Bias::Right, &());
|
|
cursor.next(&());
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
edit.new.end =
|
|
InlayOffset(((edit.new.start + edit.old_len()).0 as isize + delta) as usize);
|
|
|
|
let anchor = inlay_snapshot
|
|
.buffer
|
|
.anchor_before(inlay_snapshot.to_buffer_offset(edit.new.start));
|
|
let mut folds_cursor = self.snapshot.folds.cursor::<FoldRange>();
|
|
folds_cursor.seek(
|
|
&FoldRange(anchor..Anchor::max()),
|
|
Bias::Left,
|
|
&inlay_snapshot.buffer,
|
|
);
|
|
|
|
let mut folds = iter::from_fn({
|
|
let inlay_snapshot = &inlay_snapshot;
|
|
move || {
|
|
let item = folds_cursor.item().map(|f| {
|
|
let buffer_start = f.range.start.to_offset(&inlay_snapshot.buffer);
|
|
let buffer_end = f.range.end.to_offset(&inlay_snapshot.buffer);
|
|
inlay_snapshot.to_inlay_offset(buffer_start)
|
|
..inlay_snapshot.to_inlay_offset(buffer_end)
|
|
});
|
|
folds_cursor.next(&inlay_snapshot.buffer);
|
|
item
|
|
}
|
|
})
|
|
.peekable();
|
|
|
|
while folds.peek().map_or(false, |fold| fold.start < edit.new.end) {
|
|
let mut fold = folds.next().unwrap();
|
|
let sum = new_transforms.summary();
|
|
|
|
assert!(fold.start.0 >= sum.input.len);
|
|
|
|
while folds
|
|
.peek()
|
|
.map_or(false, |next_fold| next_fold.start <= fold.end)
|
|
{
|
|
let next_fold = folds.next().unwrap();
|
|
if next_fold.end > fold.end {
|
|
fold.end = next_fold.end;
|
|
}
|
|
}
|
|
|
|
if fold.start.0 > sum.input.len {
|
|
let text_summary = inlay_snapshot
|
|
.text_summary_for_range(InlayOffset(sum.input.len)..fold.start);
|
|
new_transforms.push(
|
|
Transform {
|
|
summary: TransformSummary {
|
|
output: text_summary.clone(),
|
|
input: text_summary,
|
|
},
|
|
output_text: None,
|
|
},
|
|
&(),
|
|
);
|
|
}
|
|
|
|
if fold.end > fold.start {
|
|
let output_text = "⋯";
|
|
new_transforms.push(
|
|
Transform {
|
|
summary: TransformSummary {
|
|
output: TextSummary::from(output_text),
|
|
input: inlay_snapshot
|
|
.text_summary_for_range(fold.start..fold.end),
|
|
},
|
|
output_text: Some(output_text),
|
|
},
|
|
&(),
|
|
);
|
|
}
|
|
}
|
|
|
|
let sum = new_transforms.summary();
|
|
if sum.input.len < edit.new.end.0 {
|
|
let text_summary = inlay_snapshot
|
|
.text_summary_for_range(InlayOffset(sum.input.len)..edit.new.end);
|
|
new_transforms.push(
|
|
Transform {
|
|
summary: TransformSummary {
|
|
output: text_summary.clone(),
|
|
input: text_summary,
|
|
},
|
|
output_text: None,
|
|
},
|
|
&(),
|
|
);
|
|
}
|
|
}
|
|
|
|
new_transforms.append(cursor.suffix(&()), &());
|
|
if new_transforms.is_empty() {
|
|
let text_summary = inlay_snapshot.text_summary();
|
|
new_transforms.push(
|
|
Transform {
|
|
summary: TransformSummary {
|
|
output: text_summary.clone(),
|
|
input: text_summary,
|
|
},
|
|
output_text: None,
|
|
},
|
|
&(),
|
|
);
|
|
}
|
|
|
|
drop(cursor);
|
|
|
|
let mut fold_edits = Vec::with_capacity(inlay_edits.len());
|
|
{
|
|
let mut old_transforms = self
|
|
.snapshot
|
|
.transforms
|
|
.cursor::<(InlayOffset, FoldOffset)>();
|
|
let mut new_transforms = new_transforms.cursor::<(InlayOffset, FoldOffset)>();
|
|
|
|
for mut edit in inlay_edits {
|
|
old_transforms.seek(&edit.old.start, Bias::Left, &());
|
|
if old_transforms.item().map_or(false, |t| t.is_fold()) {
|
|
edit.old.start = old_transforms.start().0;
|
|
}
|
|
let old_start =
|
|
old_transforms.start().1 .0 + (edit.old.start - old_transforms.start().0).0;
|
|
|
|
old_transforms.seek_forward(&edit.old.end, Bias::Right, &());
|
|
if old_transforms.item().map_or(false, |t| t.is_fold()) {
|
|
old_transforms.next(&());
|
|
edit.old.end = old_transforms.start().0;
|
|
}
|
|
let old_end =
|
|
old_transforms.start().1 .0 + (edit.old.end - old_transforms.start().0).0;
|
|
|
|
new_transforms.seek(&edit.new.start, Bias::Left, &());
|
|
if new_transforms.item().map_or(false, |t| t.is_fold()) {
|
|
edit.new.start = new_transforms.start().0;
|
|
}
|
|
let new_start =
|
|
new_transforms.start().1 .0 + (edit.new.start - new_transforms.start().0).0;
|
|
|
|
new_transforms.seek_forward(&edit.new.end, Bias::Right, &());
|
|
if new_transforms.item().map_or(false, |t| t.is_fold()) {
|
|
new_transforms.next(&());
|
|
edit.new.end = new_transforms.start().0;
|
|
}
|
|
let new_end =
|
|
new_transforms.start().1 .0 + (edit.new.end - new_transforms.start().0).0;
|
|
|
|
fold_edits.push(FoldEdit {
|
|
old: FoldOffset(old_start)..FoldOffset(old_end),
|
|
new: FoldOffset(new_start)..FoldOffset(new_end),
|
|
});
|
|
}
|
|
|
|
consolidate_fold_edits(&mut fold_edits);
|
|
}
|
|
|
|
self.snapshot.transforms = new_transforms;
|
|
self.snapshot.inlay_snapshot = inlay_snapshot;
|
|
self.snapshot.version += 1;
|
|
fold_edits
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct FoldSnapshot {
|
|
transforms: SumTree<Transform>,
|
|
folds: SumTree<Fold>,
|
|
pub inlay_snapshot: InlaySnapshot,
|
|
pub version: usize,
|
|
pub ellipses_color: Option<Hsla>,
|
|
}
|
|
|
|
impl FoldSnapshot {
|
|
#[cfg(test)]
|
|
pub fn text(&self) -> String {
|
|
self.chunks(FoldOffset(0)..self.len(), false, Highlights::default())
|
|
.map(|c| c.text)
|
|
.collect()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn fold_count(&self) -> usize {
|
|
self.folds.items(&self.inlay_snapshot.buffer).len()
|
|
}
|
|
|
|
pub fn text_summary_for_range(&self, range: Range<FoldPoint>) -> TextSummary {
|
|
let mut summary = TextSummary::default();
|
|
|
|
let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
|
|
cursor.seek(&range.start, Bias::Right, &());
|
|
if let Some(transform) = cursor.item() {
|
|
let start_in_transform = range.start.0 - cursor.start().0 .0;
|
|
let end_in_transform = cmp::min(range.end, cursor.end(&()).0).0 - cursor.start().0 .0;
|
|
if let Some(output_text) = transform.output_text {
|
|
summary = TextSummary::from(
|
|
&output_text
|
|
[start_in_transform.column as usize..end_in_transform.column as usize],
|
|
);
|
|
} else {
|
|
let inlay_start = self
|
|
.inlay_snapshot
|
|
.to_offset(InlayPoint(cursor.start().1 .0 + start_in_transform));
|
|
let inlay_end = self
|
|
.inlay_snapshot
|
|
.to_offset(InlayPoint(cursor.start().1 .0 + end_in_transform));
|
|
summary = self
|
|
.inlay_snapshot
|
|
.text_summary_for_range(inlay_start..inlay_end);
|
|
}
|
|
}
|
|
|
|
if range.end > cursor.end(&()).0 {
|
|
cursor.next(&());
|
|
summary += &cursor
|
|
.summary::<_, TransformSummary>(&range.end, Bias::Right, &())
|
|
.output;
|
|
if let Some(transform) = cursor.item() {
|
|
let end_in_transform = range.end.0 - cursor.start().0 .0;
|
|
if let Some(output_text) = transform.output_text {
|
|
summary += TextSummary::from(&output_text[..end_in_transform.column as usize]);
|
|
} else {
|
|
let inlay_start = self.inlay_snapshot.to_offset(cursor.start().1);
|
|
let inlay_end = self
|
|
.inlay_snapshot
|
|
.to_offset(InlayPoint(cursor.start().1 .0 + end_in_transform));
|
|
summary += self
|
|
.inlay_snapshot
|
|
.text_summary_for_range(inlay_start..inlay_end);
|
|
}
|
|
}
|
|
}
|
|
|
|
summary
|
|
}
|
|
|
|
pub fn to_fold_point(&self, point: InlayPoint, bias: Bias) -> FoldPoint {
|
|
let mut cursor = self.transforms.cursor::<(InlayPoint, FoldPoint)>();
|
|
cursor.seek(&point, Bias::Right, &());
|
|
if cursor.item().map_or(false, |t| t.is_fold()) {
|
|
if bias == Bias::Left || point == cursor.start().0 {
|
|
cursor.start().1
|
|
} else {
|
|
cursor.end(&()).1
|
|
}
|
|
} else {
|
|
let overshoot = point.0 - cursor.start().0 .0;
|
|
FoldPoint(cmp::min(
|
|
cursor.start().1 .0 + overshoot,
|
|
cursor.end(&()).1 .0,
|
|
))
|
|
}
|
|
}
|
|
|
|
pub fn len(&self) -> FoldOffset {
|
|
FoldOffset(self.transforms.summary().output.len)
|
|
}
|
|
|
|
pub fn line_len(&self, row: u32) -> u32 {
|
|
let line_start = FoldPoint::new(row, 0).to_offset(self).0;
|
|
let line_end = if row >= self.max_point().row() {
|
|
self.len().0
|
|
} else {
|
|
FoldPoint::new(row + 1, 0).to_offset(self).0 - 1
|
|
};
|
|
(line_end - line_start) as u32
|
|
}
|
|
|
|
pub fn buffer_rows(&self, start_row: u32) -> FoldBufferRows {
|
|
if start_row > self.transforms.summary().output.lines.row {
|
|
panic!("invalid display row {}", start_row);
|
|
}
|
|
|
|
let fold_point = FoldPoint::new(start_row, 0);
|
|
let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
|
|
cursor.seek(&fold_point, Bias::Left, &());
|
|
|
|
let overshoot = fold_point.0 - cursor.start().0 .0;
|
|
let inlay_point = InlayPoint(cursor.start().1 .0 + overshoot);
|
|
let input_buffer_rows = self.inlay_snapshot.buffer_rows(inlay_point.row());
|
|
|
|
FoldBufferRows {
|
|
fold_point,
|
|
input_buffer_rows,
|
|
cursor,
|
|
}
|
|
}
|
|
|
|
pub fn max_point(&self) -> FoldPoint {
|
|
FoldPoint(self.transforms.summary().output.lines)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn longest_row(&self) -> u32 {
|
|
self.transforms.summary().output.longest_row
|
|
}
|
|
|
|
pub fn folds_in_range<T>(&self, range: Range<T>) -> impl Iterator<Item = &Fold>
|
|
where
|
|
T: ToOffset,
|
|
{
|
|
let mut folds = intersecting_folds(&self.inlay_snapshot, &self.folds, range, false);
|
|
iter::from_fn(move || {
|
|
let item = folds.item();
|
|
folds.next(&self.inlay_snapshot.buffer);
|
|
item
|
|
})
|
|
}
|
|
|
|
pub fn intersects_fold<T>(&self, offset: T) -> bool
|
|
where
|
|
T: ToOffset,
|
|
{
|
|
let buffer_offset = offset.to_offset(&self.inlay_snapshot.buffer);
|
|
let inlay_offset = self.inlay_snapshot.to_inlay_offset(buffer_offset);
|
|
let mut cursor = self.transforms.cursor::<InlayOffset>();
|
|
cursor.seek(&inlay_offset, Bias::Right, &());
|
|
cursor.item().map_or(false, |t| t.output_text.is_some())
|
|
}
|
|
|
|
pub fn is_line_folded(&self, buffer_row: u32) -> bool {
|
|
let mut inlay_point = self
|
|
.inlay_snapshot
|
|
.to_inlay_point(Point::new(buffer_row, 0));
|
|
let mut cursor = self.transforms.cursor::<InlayPoint>();
|
|
cursor.seek(&inlay_point, Bias::Right, &());
|
|
loop {
|
|
match cursor.item() {
|
|
Some(transform) => {
|
|
let buffer_point = self.inlay_snapshot.to_buffer_point(inlay_point);
|
|
if buffer_point.row != buffer_row {
|
|
return false;
|
|
} else if transform.output_text.is_some() {
|
|
return true;
|
|
}
|
|
}
|
|
None => return false,
|
|
}
|
|
|
|
if cursor.end(&()).row() == inlay_point.row() {
|
|
cursor.next(&());
|
|
} else {
|
|
inlay_point.0 += Point::new(1, 0);
|
|
cursor.seek(&inlay_point, Bias::Right, &());
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(crate) fn chunks<'a>(
|
|
&'a self,
|
|
range: Range<FoldOffset>,
|
|
language_aware: bool,
|
|
highlights: Highlights<'a>,
|
|
) -> FoldChunks<'a> {
|
|
let mut transform_cursor = self.transforms.cursor::<(FoldOffset, InlayOffset)>();
|
|
|
|
let inlay_end = {
|
|
transform_cursor.seek(&range.end, Bias::Right, &());
|
|
let overshoot = range.end.0 - transform_cursor.start().0 .0;
|
|
transform_cursor.start().1 + InlayOffset(overshoot)
|
|
};
|
|
|
|
let inlay_start = {
|
|
transform_cursor.seek(&range.start, Bias::Right, &());
|
|
let overshoot = range.start.0 - transform_cursor.start().0 .0;
|
|
transform_cursor.start().1 + InlayOffset(overshoot)
|
|
};
|
|
|
|
FoldChunks {
|
|
transform_cursor,
|
|
inlay_chunks: self.inlay_snapshot.chunks(
|
|
inlay_start..inlay_end,
|
|
language_aware,
|
|
highlights,
|
|
),
|
|
inlay_chunk: None,
|
|
inlay_offset: inlay_start,
|
|
output_offset: range.start.0,
|
|
max_output_offset: range.end.0,
|
|
ellipses_color: self.ellipses_color,
|
|
}
|
|
}
|
|
|
|
pub fn chars_at(&self, start: FoldPoint) -> impl '_ + Iterator<Item = char> {
|
|
self.chunks(
|
|
start.to_offset(self)..self.len(),
|
|
false,
|
|
Highlights::default(),
|
|
)
|
|
.flat_map(|chunk| chunk.text.chars())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn clip_offset(&self, offset: FoldOffset, bias: Bias) -> FoldOffset {
|
|
if offset > self.len() {
|
|
self.len()
|
|
} else {
|
|
self.clip_point(offset.to_point(self), bias).to_offset(self)
|
|
}
|
|
}
|
|
|
|
pub fn clip_point(&self, point: FoldPoint, bias: Bias) -> FoldPoint {
|
|
let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
|
|
cursor.seek(&point, Bias::Right, &());
|
|
if let Some(transform) = cursor.item() {
|
|
let transform_start = cursor.start().0 .0;
|
|
if transform.output_text.is_some() {
|
|
if point.0 == transform_start || matches!(bias, Bias::Left) {
|
|
FoldPoint(transform_start)
|
|
} else {
|
|
FoldPoint(cursor.end(&()).0 .0)
|
|
}
|
|
} else {
|
|
let overshoot = InlayPoint(point.0 - transform_start);
|
|
let inlay_point = cursor.start().1 + overshoot;
|
|
let clipped_inlay_point = self.inlay_snapshot.clip_point(inlay_point, bias);
|
|
FoldPoint(cursor.start().0 .0 + (clipped_inlay_point - cursor.start().1).0)
|
|
}
|
|
} else {
|
|
FoldPoint(self.transforms.summary().output.lines)
|
|
}
|
|
}
|
|
}
|
|
|
|
fn intersecting_folds<'a, T>(
|
|
inlay_snapshot: &'a InlaySnapshot,
|
|
folds: &'a SumTree<Fold>,
|
|
range: Range<T>,
|
|
inclusive: bool,
|
|
) -> FilterCursor<'a, impl 'a + FnMut(&FoldSummary) -> bool, Fold, usize>
|
|
where
|
|
T: ToOffset,
|
|
{
|
|
let buffer = &inlay_snapshot.buffer;
|
|
let start = buffer.anchor_before(range.start.to_offset(buffer));
|
|
let end = buffer.anchor_after(range.end.to_offset(buffer));
|
|
let mut cursor = folds.filter::<_, usize>(move |summary| {
|
|
let start_cmp = start.cmp(&summary.max_end, buffer);
|
|
let end_cmp = end.cmp(&summary.min_start, buffer);
|
|
|
|
if inclusive {
|
|
start_cmp <= Ordering::Equal && end_cmp >= Ordering::Equal
|
|
} else {
|
|
start_cmp == Ordering::Less && end_cmp == Ordering::Greater
|
|
}
|
|
});
|
|
cursor.next(buffer);
|
|
cursor
|
|
}
|
|
|
|
fn consolidate_inlay_edits(edits: &mut Vec<InlayEdit>) {
|
|
edits.sort_unstable_by(|a, b| {
|
|
a.old
|
|
.start
|
|
.cmp(&b.old.start)
|
|
.then_with(|| b.old.end.cmp(&a.old.end))
|
|
});
|
|
|
|
let mut i = 1;
|
|
while i < edits.len() {
|
|
let edit = edits[i].clone();
|
|
let prev_edit = &mut edits[i - 1];
|
|
if prev_edit.old.end >= edit.old.start {
|
|
prev_edit.old.end = prev_edit.old.end.max(edit.old.end);
|
|
prev_edit.new.start = prev_edit.new.start.min(edit.new.start);
|
|
prev_edit.new.end = prev_edit.new.end.max(edit.new.end);
|
|
edits.remove(i);
|
|
continue;
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
fn consolidate_fold_edits(edits: &mut Vec<FoldEdit>) {
|
|
edits.sort_unstable_by(|a, b| {
|
|
a.old
|
|
.start
|
|
.cmp(&b.old.start)
|
|
.then_with(|| b.old.end.cmp(&a.old.end))
|
|
});
|
|
|
|
let mut i = 1;
|
|
while i < edits.len() {
|
|
let edit = edits[i].clone();
|
|
let prev_edit = &mut edits[i - 1];
|
|
if prev_edit.old.end >= edit.old.start {
|
|
prev_edit.old.end = prev_edit.old.end.max(edit.old.end);
|
|
prev_edit.new.start = prev_edit.new.start.min(edit.new.start);
|
|
prev_edit.new.end = prev_edit.new.end.max(edit.new.end);
|
|
edits.remove(i);
|
|
continue;
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Default, Eq, PartialEq)]
|
|
struct Transform {
|
|
summary: TransformSummary,
|
|
output_text: Option<&'static str>,
|
|
}
|
|
|
|
impl Transform {
|
|
fn is_fold(&self) -> bool {
|
|
self.output_text.is_some()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Default, Eq, PartialEq)]
|
|
struct TransformSummary {
|
|
output: TextSummary,
|
|
input: TextSummary,
|
|
}
|
|
|
|
impl sum_tree::Item for Transform {
|
|
type Summary = TransformSummary;
|
|
|
|
fn summary(&self) -> Self::Summary {
|
|
self.summary.clone()
|
|
}
|
|
}
|
|
|
|
impl sum_tree::Summary for TransformSummary {
|
|
type Context = ();
|
|
|
|
fn add_summary(&mut self, other: &Self, _: &()) {
|
|
self.input += &other.input;
|
|
self.output += &other.output;
|
|
}
|
|
}
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq, Debug, Default)]
|
|
pub struct FoldId(usize);
|
|
|
|
impl Into<ElementId> for FoldId {
|
|
fn into(self) -> ElementId {
|
|
ElementId::Integer(self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct Fold {
|
|
pub id: FoldId,
|
|
pub range: FoldRange,
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub struct FoldRange(Range<Anchor>);
|
|
|
|
impl Deref for FoldRange {
|
|
type Target = Range<Anchor>;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl DerefMut for FoldRange {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.0
|
|
}
|
|
}
|
|
|
|
impl Default for FoldRange {
|
|
fn default() -> Self {
|
|
Self(Anchor::min()..Anchor::max())
|
|
}
|
|
}
|
|
|
|
impl sum_tree::Item for Fold {
|
|
type Summary = FoldSummary;
|
|
|
|
fn summary(&self) -> Self::Summary {
|
|
FoldSummary {
|
|
start: self.range.start.clone(),
|
|
end: self.range.end.clone(),
|
|
min_start: self.range.start.clone(),
|
|
max_end: self.range.end.clone(),
|
|
count: 1,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct FoldSummary {
|
|
start: Anchor,
|
|
end: Anchor,
|
|
min_start: Anchor,
|
|
max_end: Anchor,
|
|
count: usize,
|
|
}
|
|
|
|
impl Default for FoldSummary {
|
|
fn default() -> Self {
|
|
Self {
|
|
start: Anchor::min(),
|
|
end: Anchor::max(),
|
|
min_start: Anchor::max(),
|
|
max_end: Anchor::min(),
|
|
count: 0,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl sum_tree::Summary for FoldSummary {
|
|
type Context = MultiBufferSnapshot;
|
|
|
|
fn add_summary(&mut self, other: &Self, buffer: &Self::Context) {
|
|
if other.min_start.cmp(&self.min_start, buffer) == Ordering::Less {
|
|
self.min_start = other.min_start.clone();
|
|
}
|
|
if other.max_end.cmp(&self.max_end, buffer) == Ordering::Greater {
|
|
self.max_end = other.max_end.clone();
|
|
}
|
|
|
|
#[cfg(debug_assertions)]
|
|
{
|
|
let start_comparison = self.start.cmp(&other.start, buffer);
|
|
assert!(start_comparison <= Ordering::Equal);
|
|
if start_comparison == Ordering::Equal {
|
|
assert!(self.end.cmp(&other.end, buffer) >= Ordering::Equal);
|
|
}
|
|
}
|
|
|
|
self.start = other.start.clone();
|
|
self.end = other.end.clone();
|
|
self.count += other.count;
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, FoldSummary> for FoldRange {
|
|
fn add_summary(&mut self, summary: &'a FoldSummary, _: &MultiBufferSnapshot) {
|
|
self.0.start = summary.start.clone();
|
|
self.0.end = summary.end.clone();
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::SeekTarget<'a, FoldSummary, FoldRange> for FoldRange {
|
|
fn cmp(&self, other: &Self, buffer: &MultiBufferSnapshot) -> Ordering {
|
|
self.0.cmp(&other.0, buffer)
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, FoldSummary> for usize {
|
|
fn add_summary(&mut self, summary: &'a FoldSummary, _: &MultiBufferSnapshot) {
|
|
*self += summary.count;
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct FoldBufferRows<'a> {
|
|
cursor: Cursor<'a, Transform, (FoldPoint, InlayPoint)>,
|
|
input_buffer_rows: InlayBufferRows<'a>,
|
|
fold_point: FoldPoint,
|
|
}
|
|
|
|
impl<'a> Iterator for FoldBufferRows<'a> {
|
|
type Item = Option<u32>;
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
let mut traversed_fold = false;
|
|
while self.fold_point > self.cursor.end(&()).0 {
|
|
self.cursor.next(&());
|
|
traversed_fold = true;
|
|
if self.cursor.item().is_none() {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if self.cursor.item().is_some() {
|
|
if traversed_fold {
|
|
self.input_buffer_rows.seek(self.cursor.start().1.row());
|
|
self.input_buffer_rows.next();
|
|
}
|
|
*self.fold_point.row_mut() += 1;
|
|
self.input_buffer_rows.next()
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct FoldChunks<'a> {
|
|
transform_cursor: Cursor<'a, Transform, (FoldOffset, InlayOffset)>,
|
|
inlay_chunks: InlayChunks<'a>,
|
|
inlay_chunk: Option<(InlayOffset, Chunk<'a>)>,
|
|
inlay_offset: InlayOffset,
|
|
output_offset: usize,
|
|
max_output_offset: usize,
|
|
ellipses_color: Option<Hsla>,
|
|
}
|
|
|
|
impl<'a> Iterator for FoldChunks<'a> {
|
|
type Item = Chunk<'a>;
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
if self.output_offset >= self.max_output_offset {
|
|
return None;
|
|
}
|
|
|
|
let transform = self.transform_cursor.item()?;
|
|
|
|
// If we're in a fold, then return the fold's display text and
|
|
// advance the transform and buffer cursors to the end of the fold.
|
|
if let Some(output_text) = transform.output_text {
|
|
self.inlay_chunk.take();
|
|
self.inlay_offset += InlayOffset(transform.summary.input.len);
|
|
self.inlay_chunks.seek(self.inlay_offset);
|
|
|
|
while self.inlay_offset >= self.transform_cursor.end(&()).1
|
|
&& self.transform_cursor.item().is_some()
|
|
{
|
|
self.transform_cursor.next(&());
|
|
}
|
|
|
|
self.output_offset += output_text.len();
|
|
return Some(Chunk {
|
|
text: output_text,
|
|
highlight_style: self.ellipses_color.map(|color| HighlightStyle {
|
|
color: Some(color),
|
|
..Default::default()
|
|
}),
|
|
..Default::default()
|
|
});
|
|
}
|
|
|
|
// Retrieve a chunk from the current location in the buffer.
|
|
if self.inlay_chunk.is_none() {
|
|
let chunk_offset = self.inlay_chunks.offset();
|
|
self.inlay_chunk = self.inlay_chunks.next().map(|chunk| (chunk_offset, chunk));
|
|
}
|
|
|
|
// Otherwise, take a chunk from the buffer's text.
|
|
if let Some((buffer_chunk_start, mut chunk)) = self.inlay_chunk {
|
|
let buffer_chunk_end = buffer_chunk_start + InlayOffset(chunk.text.len());
|
|
let transform_end = self.transform_cursor.end(&()).1;
|
|
let chunk_end = buffer_chunk_end.min(transform_end);
|
|
|
|
chunk.text = &chunk.text
|
|
[(self.inlay_offset - buffer_chunk_start).0..(chunk_end - buffer_chunk_start).0];
|
|
|
|
if chunk_end == transform_end {
|
|
self.transform_cursor.next(&());
|
|
} else if chunk_end == buffer_chunk_end {
|
|
self.inlay_chunk.take();
|
|
}
|
|
|
|
self.inlay_offset = chunk_end;
|
|
self.output_offset += chunk.text.len();
|
|
return Some(chunk);
|
|
}
|
|
|
|
None
|
|
}
|
|
}
|
|
|
|
#[derive(Copy, Clone, Eq, PartialEq)]
|
|
struct HighlightEndpoint {
|
|
offset: InlayOffset,
|
|
is_start: bool,
|
|
tag: Option<TypeId>,
|
|
style: HighlightStyle,
|
|
}
|
|
|
|
impl PartialOrd for HighlightEndpoint {
|
|
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
|
Some(self.cmp(other))
|
|
}
|
|
}
|
|
|
|
impl Ord for HighlightEndpoint {
|
|
fn cmp(&self, other: &Self) -> Ordering {
|
|
self.offset
|
|
.cmp(&other.offset)
|
|
.then_with(|| other.is_start.cmp(&self.is_start))
|
|
}
|
|
}
|
|
|
|
#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
|
|
pub struct FoldOffset(pub usize);
|
|
|
|
impl FoldOffset {
|
|
pub fn to_point(self, snapshot: &FoldSnapshot) -> FoldPoint {
|
|
let mut cursor = snapshot
|
|
.transforms
|
|
.cursor::<(FoldOffset, TransformSummary)>();
|
|
cursor.seek(&self, Bias::Right, &());
|
|
let overshoot = if cursor.item().map_or(true, |t| t.is_fold()) {
|
|
Point::new(0, (self.0 - cursor.start().0 .0) as u32)
|
|
} else {
|
|
let inlay_offset = cursor.start().1.input.len + self.0 - cursor.start().0 .0;
|
|
let inlay_point = snapshot.inlay_snapshot.to_point(InlayOffset(inlay_offset));
|
|
inlay_point.0 - cursor.start().1.input.lines
|
|
};
|
|
FoldPoint(cursor.start().1.output.lines + overshoot)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn to_inlay_offset(self, snapshot: &FoldSnapshot) -> InlayOffset {
|
|
let mut cursor = snapshot.transforms.cursor::<(FoldOffset, InlayOffset)>();
|
|
cursor.seek(&self, Bias::Right, &());
|
|
let overshoot = self.0 - cursor.start().0 .0;
|
|
InlayOffset(cursor.start().1 .0 + overshoot)
|
|
}
|
|
}
|
|
|
|
impl Add for FoldOffset {
|
|
type Output = Self;
|
|
|
|
fn add(self, rhs: Self) -> Self::Output {
|
|
Self(self.0 + rhs.0)
|
|
}
|
|
}
|
|
|
|
impl AddAssign for FoldOffset {
|
|
fn add_assign(&mut self, rhs: Self) {
|
|
self.0 += rhs.0;
|
|
}
|
|
}
|
|
|
|
impl Sub for FoldOffset {
|
|
type Output = Self;
|
|
|
|
fn sub(self, rhs: Self) -> Self::Output {
|
|
Self(self.0 - rhs.0)
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, TransformSummary> for FoldOffset {
|
|
fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
|
|
self.0 += &summary.output.len;
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayPoint {
|
|
fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
|
|
self.0 += &summary.input.lines;
|
|
}
|
|
}
|
|
|
|
impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayOffset {
|
|
fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
|
|
self.0 += &summary.input.len;
|
|
}
|
|
}
|
|
|
|
pub type FoldEdit = Edit<FoldOffset>;
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::{display_map::inlay_map::InlayMap, MultiBuffer, ToPoint};
|
|
use collections::HashSet;
|
|
use rand::prelude::*;
|
|
use settings::SettingsStore;
|
|
use std::{env, mem};
|
|
use text::Patch;
|
|
use util::test::sample_text;
|
|
use util::RandomCharIter;
|
|
use Bias::{Left, Right};
|
|
|
|
#[gpui::test]
|
|
fn test_basic_folds(cx: &mut gpui::AppContext) {
|
|
init_test(cx);
|
|
let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
|
|
let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot, vec![]);
|
|
let (snapshot2, edits) = writer.fold(vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(2, 4)..Point::new(4, 1),
|
|
]);
|
|
assert_eq!(snapshot2.text(), "aa⋯cc⋯eeeee");
|
|
assert_eq!(
|
|
edits,
|
|
&[
|
|
FoldEdit {
|
|
old: FoldOffset(2)..FoldOffset(16),
|
|
new: FoldOffset(2)..FoldOffset(5),
|
|
},
|
|
FoldEdit {
|
|
old: FoldOffset(18)..FoldOffset(29),
|
|
new: FoldOffset(7)..FoldOffset(10)
|
|
},
|
|
]
|
|
);
|
|
|
|
let buffer_snapshot = buffer.update(cx, |buffer, cx| {
|
|
buffer.edit(
|
|
vec![
|
|
(Point::new(0, 0)..Point::new(0, 1), "123"),
|
|
(Point::new(2, 3)..Point::new(2, 3), "123"),
|
|
],
|
|
None,
|
|
cx,
|
|
);
|
|
buffer.snapshot(cx)
|
|
});
|
|
|
|
let (inlay_snapshot, inlay_edits) =
|
|
inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
|
|
let (snapshot3, edits) = map.read(inlay_snapshot, inlay_edits);
|
|
assert_eq!(snapshot3.text(), "123a⋯c123c⋯eeeee");
|
|
assert_eq!(
|
|
edits,
|
|
&[
|
|
FoldEdit {
|
|
old: FoldOffset(0)..FoldOffset(1),
|
|
new: FoldOffset(0)..FoldOffset(3),
|
|
},
|
|
FoldEdit {
|
|
old: FoldOffset(6)..FoldOffset(6),
|
|
new: FoldOffset(8)..FoldOffset(11),
|
|
},
|
|
]
|
|
);
|
|
|
|
let buffer_snapshot = buffer.update(cx, |buffer, cx| {
|
|
buffer.edit([(Point::new(2, 6)..Point::new(4, 3), "456")], None, cx);
|
|
buffer.snapshot(cx)
|
|
});
|
|
let (inlay_snapshot, inlay_edits) =
|
|
inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
|
|
let (snapshot4, _) = map.read(inlay_snapshot.clone(), inlay_edits);
|
|
assert_eq!(snapshot4.text(), "123a⋯c123456eee");
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), false);
|
|
let (snapshot5, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
assert_eq!(snapshot5.text(), "123a⋯c123456eee");
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), true);
|
|
let (snapshot6, _) = map.read(inlay_snapshot, vec![]);
|
|
assert_eq!(snapshot6.text(), "123aaaaa\nbbbbbb\nccc123456eee");
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_adjacent_folds(cx: &mut gpui::AppContext) {
|
|
init_test(cx);
|
|
let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);
|
|
let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
|
|
|
|
{
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![5..8]);
|
|
let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
assert_eq!(snapshot.text(), "abcde⋯ijkl");
|
|
|
|
// Create an fold adjacent to the start of the first fold.
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![0..1, 2..5]);
|
|
let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
assert_eq!(snapshot.text(), "⋯b⋯ijkl");
|
|
|
|
// Create an fold adjacent to the end of the first fold.
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![11..11, 8..10]);
|
|
let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
assert_eq!(snapshot.text(), "⋯b⋯kl");
|
|
}
|
|
|
|
{
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
// Create two adjacent folds.
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![0..2, 2..5]);
|
|
let (snapshot, _) = map.read(inlay_snapshot, vec![]);
|
|
assert_eq!(snapshot.text(), "⋯fghijkl");
|
|
|
|
// Edit within one of the folds.
|
|
let buffer_snapshot = buffer.update(cx, |buffer, cx| {
|
|
buffer.edit([(0..1, "12345")], None, cx);
|
|
buffer.snapshot(cx)
|
|
});
|
|
let (inlay_snapshot, inlay_edits) =
|
|
inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
|
|
let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
|
|
assert_eq!(snapshot.text(), "12345⋯fghijkl");
|
|
}
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_overlapping_folds(cx: &mut gpui::AppContext) {
|
|
let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(0, 4)..Point::new(1, 0),
|
|
Point::new(1, 2)..Point::new(3, 2),
|
|
Point::new(3, 1)..Point::new(4, 1),
|
|
]);
|
|
let (snapshot, _) = map.read(inlay_snapshot, vec![]);
|
|
assert_eq!(snapshot.text(), "aa⋯eeeee");
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_merging_folds_via_edit(cx: &mut gpui::AppContext) {
|
|
init_test(cx);
|
|
let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
|
|
let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(3, 1)..Point::new(4, 1),
|
|
]);
|
|
let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee");
|
|
|
|
let buffer_snapshot = buffer.update(cx, |buffer, cx| {
|
|
buffer.edit([(Point::new(2, 2)..Point::new(3, 1), "")], None, cx);
|
|
buffer.snapshot(cx)
|
|
});
|
|
let (inlay_snapshot, inlay_edits) =
|
|
inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
|
|
let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
|
|
assert_eq!(snapshot.text(), "aa⋯eeeee");
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_folds_in_range(cx: &mut gpui::AppContext) {
|
|
let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(0, 4)..Point::new(1, 0),
|
|
Point::new(1, 2)..Point::new(3, 2),
|
|
Point::new(3, 1)..Point::new(4, 1),
|
|
]);
|
|
let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
let fold_ranges = snapshot
|
|
.folds_in_range(Point::new(1, 0)..Point::new(1, 3))
|
|
.map(|fold| {
|
|
fold.range.start.to_point(&buffer_snapshot)
|
|
..fold.range.end.to_point(&buffer_snapshot)
|
|
})
|
|
.collect::<Vec<_>>();
|
|
assert_eq!(
|
|
fold_ranges,
|
|
vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(1, 2)..Point::new(3, 2)
|
|
]
|
|
);
|
|
}
|
|
|
|
#[gpui::test(iterations = 100)]
|
|
fn test_random_folds(cx: &mut gpui::AppContext, mut rng: StdRng) {
|
|
init_test(cx);
|
|
let operations = env::var("OPERATIONS")
|
|
.map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
|
|
.unwrap_or(10);
|
|
|
|
let len = rng.gen_range(0..10);
|
|
let text = RandomCharIter::new(&mut rng).take(len).collect::<String>();
|
|
let buffer = if rng.gen() {
|
|
MultiBuffer::build_simple(&text, cx)
|
|
} else {
|
|
MultiBuffer::build_random(&mut rng, cx)
|
|
};
|
|
let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut initial_snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
|
|
let mut snapshot_edits = Vec::new();
|
|
|
|
let mut next_inlay_id = 0;
|
|
for _ in 0..operations {
|
|
log::info!("text: {:?}", buffer_snapshot.text());
|
|
let mut buffer_edits = Vec::new();
|
|
let mut inlay_edits = Vec::new();
|
|
match rng.gen_range(0..=100) {
|
|
0..=39 => {
|
|
snapshot_edits.extend(map.randomly_mutate(&mut rng));
|
|
}
|
|
40..=59 => {
|
|
let (_, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
|
|
inlay_edits = edits;
|
|
}
|
|
_ => buffer.update(cx, |buffer, cx| {
|
|
let subscription = buffer.subscribe();
|
|
let edit_count = rng.gen_range(1..=5);
|
|
buffer.randomly_mutate(&mut rng, edit_count, cx);
|
|
buffer_snapshot = buffer.snapshot(cx);
|
|
let edits = subscription.consume().into_inner();
|
|
log::info!("editing {:?}", edits);
|
|
buffer_edits.extend(edits);
|
|
}),
|
|
};
|
|
|
|
let (inlay_snapshot, new_inlay_edits) =
|
|
inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
|
|
log::info!("inlay text {:?}", inlay_snapshot.text());
|
|
|
|
let inlay_edits = Patch::new(inlay_edits)
|
|
.compose(new_inlay_edits)
|
|
.into_inner();
|
|
let (snapshot, edits) = map.read(inlay_snapshot.clone(), inlay_edits);
|
|
snapshot_edits.push((snapshot.clone(), edits));
|
|
|
|
let mut expected_text: String = inlay_snapshot.text().to_string();
|
|
for fold_range in map.merged_fold_ranges().into_iter().rev() {
|
|
let fold_inlay_start = inlay_snapshot.to_inlay_offset(fold_range.start);
|
|
let fold_inlay_end = inlay_snapshot.to_inlay_offset(fold_range.end);
|
|
expected_text.replace_range(fold_inlay_start.0..fold_inlay_end.0, "⋯");
|
|
}
|
|
|
|
assert_eq!(snapshot.text(), expected_text);
|
|
log::info!(
|
|
"fold text {:?} ({} lines)",
|
|
expected_text,
|
|
expected_text.matches('\n').count() + 1
|
|
);
|
|
|
|
let mut prev_row = 0;
|
|
let mut expected_buffer_rows = Vec::new();
|
|
for fold_range in map.merged_fold_ranges().into_iter() {
|
|
let fold_start = inlay_snapshot
|
|
.to_point(inlay_snapshot.to_inlay_offset(fold_range.start))
|
|
.row();
|
|
let fold_end = inlay_snapshot
|
|
.to_point(inlay_snapshot.to_inlay_offset(fold_range.end))
|
|
.row();
|
|
expected_buffer_rows.extend(
|
|
inlay_snapshot
|
|
.buffer_rows(prev_row)
|
|
.take((1 + fold_start - prev_row) as usize),
|
|
);
|
|
prev_row = 1 + fold_end;
|
|
}
|
|
expected_buffer_rows.extend(inlay_snapshot.buffer_rows(prev_row));
|
|
|
|
assert_eq!(
|
|
expected_buffer_rows.len(),
|
|
expected_text.matches('\n').count() + 1,
|
|
"wrong expected buffer rows {:?}. text: {:?}",
|
|
expected_buffer_rows,
|
|
expected_text
|
|
);
|
|
|
|
for (output_row, line) in expected_text.lines().enumerate() {
|
|
let line_len = snapshot.line_len(output_row as u32);
|
|
assert_eq!(line_len, line.len() as u32);
|
|
}
|
|
|
|
let longest_row = snapshot.longest_row();
|
|
let longest_char_column = expected_text
|
|
.split('\n')
|
|
.nth(longest_row as usize)
|
|
.unwrap()
|
|
.chars()
|
|
.count();
|
|
let mut fold_point = FoldPoint::new(0, 0);
|
|
let mut fold_offset = FoldOffset(0);
|
|
let mut char_column = 0;
|
|
for c in expected_text.chars() {
|
|
let inlay_point = fold_point.to_inlay_point(&snapshot);
|
|
let inlay_offset = fold_offset.to_inlay_offset(&snapshot);
|
|
assert_eq!(
|
|
snapshot.to_fold_point(inlay_point, Right),
|
|
fold_point,
|
|
"{:?} -> fold point",
|
|
inlay_point,
|
|
);
|
|
assert_eq!(
|
|
inlay_snapshot.to_offset(inlay_point),
|
|
inlay_offset,
|
|
"inlay_snapshot.to_offset({:?})",
|
|
inlay_point,
|
|
);
|
|
assert_eq!(
|
|
fold_point.to_offset(&snapshot),
|
|
fold_offset,
|
|
"fold_point.to_offset({:?})",
|
|
fold_point,
|
|
);
|
|
|
|
if c == '\n' {
|
|
*fold_point.row_mut() += 1;
|
|
*fold_point.column_mut() = 0;
|
|
char_column = 0;
|
|
} else {
|
|
*fold_point.column_mut() += c.len_utf8() as u32;
|
|
char_column += 1;
|
|
}
|
|
fold_offset.0 += c.len_utf8();
|
|
if char_column > longest_char_column {
|
|
panic!(
|
|
"invalid longest row {:?} (chars {}), found row {:?} (chars: {})",
|
|
longest_row,
|
|
longest_char_column,
|
|
fold_point.row(),
|
|
char_column
|
|
);
|
|
}
|
|
}
|
|
|
|
for _ in 0..5 {
|
|
let mut start = snapshot
|
|
.clip_offset(FoldOffset(rng.gen_range(0..=snapshot.len().0)), Bias::Left);
|
|
let mut end = snapshot
|
|
.clip_offset(FoldOffset(rng.gen_range(0..=snapshot.len().0)), Bias::Right);
|
|
if start > end {
|
|
mem::swap(&mut start, &mut end);
|
|
}
|
|
|
|
let text = &expected_text[start.0..end.0];
|
|
assert_eq!(
|
|
snapshot
|
|
.chunks(start..end, false, Highlights::default())
|
|
.map(|c| c.text)
|
|
.collect::<String>(),
|
|
text,
|
|
);
|
|
}
|
|
|
|
let mut fold_row = 0;
|
|
while fold_row < expected_buffer_rows.len() as u32 {
|
|
assert_eq!(
|
|
snapshot.buffer_rows(fold_row).collect::<Vec<_>>(),
|
|
expected_buffer_rows[(fold_row as usize)..],
|
|
"wrong buffer rows starting at fold row {}",
|
|
fold_row,
|
|
);
|
|
fold_row += 1;
|
|
}
|
|
|
|
let folded_buffer_rows = map
|
|
.merged_fold_ranges()
|
|
.iter()
|
|
.flat_map(|range| {
|
|
let start_row = range.start.to_point(&buffer_snapshot).row;
|
|
let end = range.end.to_point(&buffer_snapshot);
|
|
if end.column == 0 {
|
|
start_row..end.row
|
|
} else {
|
|
start_row..end.row + 1
|
|
}
|
|
})
|
|
.collect::<HashSet<_>>();
|
|
for row in 0..=buffer_snapshot.max_point().row {
|
|
assert_eq!(
|
|
snapshot.is_line_folded(row),
|
|
folded_buffer_rows.contains(&row),
|
|
"expected buffer row {}{} to be folded",
|
|
row,
|
|
if folded_buffer_rows.contains(&row) {
|
|
""
|
|
} else {
|
|
" not"
|
|
}
|
|
);
|
|
}
|
|
|
|
for _ in 0..5 {
|
|
let end =
|
|
buffer_snapshot.clip_offset(rng.gen_range(0..=buffer_snapshot.len()), Right);
|
|
let start = buffer_snapshot.clip_offset(rng.gen_range(0..=end), Left);
|
|
let expected_folds = map
|
|
.snapshot
|
|
.folds
|
|
.items(&buffer_snapshot)
|
|
.into_iter()
|
|
.filter(|fold| {
|
|
let start = buffer_snapshot.anchor_before(start);
|
|
let end = buffer_snapshot.anchor_after(end);
|
|
start.cmp(&fold.range.end, &buffer_snapshot) == Ordering::Less
|
|
&& end.cmp(&fold.range.start, &buffer_snapshot) == Ordering::Greater
|
|
})
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(
|
|
snapshot
|
|
.folds_in_range(start..end)
|
|
.cloned()
|
|
.collect::<Vec<_>>(),
|
|
expected_folds
|
|
);
|
|
}
|
|
|
|
let text = snapshot.text();
|
|
for _ in 0..5 {
|
|
let start_row = rng.gen_range(0..=snapshot.max_point().row());
|
|
let start_column = rng.gen_range(0..=snapshot.line_len(start_row));
|
|
let end_row = rng.gen_range(0..=snapshot.max_point().row());
|
|
let end_column = rng.gen_range(0..=snapshot.line_len(end_row));
|
|
let mut start =
|
|
snapshot.clip_point(FoldPoint::new(start_row, start_column), Bias::Left);
|
|
let mut end = snapshot.clip_point(FoldPoint::new(end_row, end_column), Bias::Right);
|
|
if start > end {
|
|
mem::swap(&mut start, &mut end);
|
|
}
|
|
|
|
let lines = start..end;
|
|
let bytes = start.to_offset(&snapshot)..end.to_offset(&snapshot);
|
|
assert_eq!(
|
|
snapshot.text_summary_for_range(lines),
|
|
TextSummary::from(&text[bytes.start.0..bytes.end.0])
|
|
)
|
|
}
|
|
|
|
let mut text = initial_snapshot.text();
|
|
for (snapshot, edits) in snapshot_edits.drain(..) {
|
|
let new_text = snapshot.text();
|
|
for edit in edits {
|
|
let old_bytes = edit.new.start.0..edit.new.start.0 + edit.old_len().0;
|
|
let new_bytes = edit.new.start.0..edit.new.end.0;
|
|
text.replace_range(old_bytes, &new_text[new_bytes]);
|
|
}
|
|
|
|
assert_eq!(text, new_text);
|
|
initial_snapshot = snapshot;
|
|
}
|
|
}
|
|
}
|
|
|
|
#[gpui::test]
|
|
fn test_buffer_rows(cx: &mut gpui::AppContext) {
|
|
let text = sample_text(6, 6, 'a') + "\n";
|
|
let buffer = MultiBuffer::build_simple(&text, cx);
|
|
|
|
let buffer_snapshot = buffer.read(cx).snapshot(cx);
|
|
let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
|
|
let mut map = FoldMap::new(inlay_snapshot.clone()).0;
|
|
|
|
let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
|
|
writer.fold(vec![
|
|
Point::new(0, 2)..Point::new(2, 2),
|
|
Point::new(3, 1)..Point::new(4, 1),
|
|
]);
|
|
|
|
let (snapshot, _) = map.read(inlay_snapshot, vec![]);
|
|
assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee\nffffff\n");
|
|
assert_eq!(
|
|
snapshot.buffer_rows(0).collect::<Vec<_>>(),
|
|
[Some(0), Some(3), Some(5), Some(6)]
|
|
);
|
|
assert_eq!(snapshot.buffer_rows(3).collect::<Vec<_>>(), [Some(6)]);
|
|
}
|
|
|
|
fn init_test(cx: &mut gpui::AppContext) {
|
|
let store = SettingsStore::test(cx);
|
|
cx.set_global(store);
|
|
}
|
|
|
|
impl FoldMap {
|
|
fn merged_fold_ranges(&self) -> Vec<Range<usize>> {
|
|
let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
|
|
let buffer = &inlay_snapshot.buffer;
|
|
let mut folds = self.snapshot.folds.items(buffer);
|
|
// Ensure sorting doesn't change how folds get merged and displayed.
|
|
folds.sort_by(|a, b| a.range.cmp(&b.range, buffer));
|
|
let mut fold_ranges = folds
|
|
.iter()
|
|
.map(|fold| fold.range.start.to_offset(buffer)..fold.range.end.to_offset(buffer))
|
|
.peekable();
|
|
|
|
let mut merged_ranges = Vec::new();
|
|
while let Some(mut fold_range) = fold_ranges.next() {
|
|
while let Some(next_range) = fold_ranges.peek() {
|
|
if fold_range.end >= next_range.start {
|
|
if next_range.end > fold_range.end {
|
|
fold_range.end = next_range.end;
|
|
}
|
|
fold_ranges.next();
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
if fold_range.end > fold_range.start {
|
|
merged_ranges.push(fold_range);
|
|
}
|
|
}
|
|
merged_ranges
|
|
}
|
|
|
|
pub fn randomly_mutate(
|
|
&mut self,
|
|
rng: &mut impl Rng,
|
|
) -> Vec<(FoldSnapshot, Vec<FoldEdit>)> {
|
|
let mut snapshot_edits = Vec::new();
|
|
match rng.gen_range(0..=100) {
|
|
0..=39 if !self.snapshot.folds.is_empty() => {
|
|
let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
|
|
let buffer = &inlay_snapshot.buffer;
|
|
let mut to_unfold = Vec::new();
|
|
for _ in 0..rng.gen_range(1..=3) {
|
|
let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
|
|
let start = buffer.clip_offset(rng.gen_range(0..=end), Left);
|
|
to_unfold.push(start..end);
|
|
}
|
|
log::info!("unfolding {:?}", to_unfold);
|
|
let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
|
|
snapshot_edits.push((snapshot, edits));
|
|
let (snapshot, edits) = writer.fold(to_unfold);
|
|
snapshot_edits.push((snapshot, edits));
|
|
}
|
|
_ => {
|
|
let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
|
|
let buffer = &inlay_snapshot.buffer;
|
|
let mut to_fold = Vec::new();
|
|
for _ in 0..rng.gen_range(1..=2) {
|
|
let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
|
|
let start = buffer.clip_offset(rng.gen_range(0..=end), Left);
|
|
to_fold.push(start..end);
|
|
}
|
|
log::info!("folding {:?}", to_fold);
|
|
let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
|
|
snapshot_edits.push((snapshot, edits));
|
|
let (snapshot, edits) = writer.fold(to_fold);
|
|
snapshot_edits.push((snapshot, edits));
|
|
}
|
|
}
|
|
snapshot_edits
|
|
}
|
|
}
|
|
}
|