mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 08:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Verify FoldMap::unfold in randomized test

Browse source
This commit is contained in:
Antonio Scandurra 2021-05-07 09:39:55 +02:00
parent 6890a3d9fa
commit 6a2fe38d94
1 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
zed/src/editor/display_map/fold_map.rs
View file

@ -143,7 +143,7 @@ impl FoldMap {
let mut edits = Vec::new(); let mut edits = Vec::new();
let mut fold_ixs_to_delete = Vec::new(); let mut fold_ixs_to_delete = Vec::new();
for range in ranges.into_iter() { for range in ranges.into_iter() {
// Remove intersecting folds and add their ranges to edits that are passed to apply_edits // Remove intersecting folds and add their ranges to edits that are passed to apply_edits.
let mut folds_cursor = self.intersecting_folds(range, ctx)?; let mut folds_cursor = self.intersecting_folds(range, ctx)?;
while let Some(fold) = folds_cursor.item() { while let Some(fold) = folds_cursor.item() {
let offset_range = let offset_range =
@ -156,8 +156,15 @@ impl FoldMap {
folds_cursor.next(); folds_cursor.next();
} }
} }
fold_ixs_to_delete.sort_unstable(); fold_ixs_to_delete.sort_unstable();
fold_ixs_to_delete.dedup(); fold_ixs_to_delete.dedup();
edits.sort_unstable_by(|a, b| {
a.old_range
.start
.cmp(&b.old_range.start)
.then_with(|| b.old_range.end.cmp(&a.old_range.end))
});
self.folds = { self.folds = {
let mut cursor = self.folds.cursor::<_, ()>(); let mut cursor = self.folds.cursor::<_, ()>();
@ -169,7 +176,6 @@ impl FoldMap {
folds.push_tree(cursor.suffix(buffer), buffer); folds.push_tree(cursor.suffix(buffer), buffer);
folds folds
}; };
self.apply_edits(edits, ctx); self.apply_edits(edits, ctx);
Ok(()) Ok(())
} }
@ -868,26 +874,38 @@ mod tests {
for _ in 0..operations { for _ in 0..operations {
log::info!("text: {:?}", buffer.read(app).text()); log::info!("text: {:?}", buffer.read(app).text());
if rng.gen() { match rng.gen_range(0..=100) {
let buffer = buffer.read(app); 0..=34 => {
let buffer = buffer.read(app);
let fold_count = rng.gen_range(1..=5); let mut to_fold = Vec::new();
let mut fold_ranges: Vec<Range<usize>> = Vec::new(); for _ in 0..rng.gen_range(1..=5) {
for _ in 0..fold_count { let end = rng.gen_range(0..=buffer.len());
let end = rng.gen_range(0..buffer.len() + 1); let start = rng.gen_range(0..=end);
let start = rng.gen_range(0..end + 1); to_fold.push(start..end);
fold_ranges.push(start..end); }
log::info!("folding {:?}", to_fold);
map.fold(to_fold, app.as_ref()).unwrap();
}
35..=59 if !map.folds.is_empty() => {
let buffer = buffer.read(app);
let mut to_unfold = Vec::new();
for _ in 0..rng.gen_range(1..=3) {
let end = rng.gen_range(0..=buffer.len());
let start = rng.gen_range(0..=end);
to_unfold.push(start..end);
}
log::info!("unfolding {:?}", to_unfold);
map.unfold(to_unfold, app.as_ref()).unwrap();
}
_ => {
let edits = buffer.update(app, |buffer, ctx| {
let start_version = buffer.version.clone();
let edit_count = rng.gen_range(1..=5);
buffer.randomly_edit(&mut rng, edit_count, Some(ctx));
buffer.edits_since(start_version).collect::<Vec<_>>()
});
log::info!("editing {:?}", edits);
} }
log::info!("folding {:?}", fold_ranges);
map.fold(fold_ranges.clone(), app.as_ref()).unwrap();
} else {
let edits = buffer.update(app, |buffer, ctx| {
let start_version = buffer.version.clone();
let edit_count = rng.gen_range(1..=5);
buffer.randomly_edit(&mut rng, edit_count, Some(ctx));
buffer.edits_since(start_version).collect::<Vec<_>>()
});
log::info!("editing {:?}", edits);
} }
map.check_invariants(app.as_ref()); map.check_invariants(app.as_ref());