mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

WIP: Flesh out more of the suggestions randomized test

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-20 17:25:36 +01:00
parent 9970e5f60c
commit 4d6726ef39
1 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
crates/editor/src/display_map/suggestion_map.rs
View file

@ -51,15 +51,16 @@ pub struct Suggestion<T> {
pub struct SuggestionMap(Mutex<SuggestionSnapshot>); pub struct SuggestionMap(Mutex<SuggestionSnapshot>);
impl SuggestionMap { impl SuggestionMap {
pub fn new(fold_snapshot: FoldSnapshot) -> Self { pub fn new(fold_snapshot: FoldSnapshot) -> (Self, SuggestionSnapshot) {
Self(Mutex::new(SuggestionSnapshot { let snapshot = SuggestionSnapshot {
fold_snapshot, fold_snapshot,
suggestion: None, suggestion: None,
})) };
(Self(Mutex::new(snapshot.clone())), snapshot)
} }
pub fn replace<T>( pub fn replace<T>(
&mut self, &self,
new_suggestion: Option<Suggestion<T>>, new_suggestion: Option<Suggestion<T>>,
fold_snapshot: FoldSnapshot, fold_snapshot: FoldSnapshot,
fold_edits: Vec<FoldEdit>, fold_edits: Vec<FoldEdit>,
@ -303,6 +304,8 @@ mod tests {
use crate::{display_map::fold_map::FoldMap, MultiBuffer}; use crate::{display_map::fold_map::FoldMap, MultiBuffer};
use gpui::MutableAppContext; use gpui::MutableAppContext;
use rand::{prelude::StdRng, Rng}; use rand::{prelude::StdRng, Rng};
use settings::Settings;
use std::env;
#[gpui::test(iterations = 100)] #[gpui::test(iterations = 100)]
fn test_random_suggestions(cx: &mut MutableAppContext, mut rng: StdRng) { fn test_random_suggestions(cx: &mut MutableAppContext, mut rng: StdRng) {
@ -320,19 +323,44 @@ mod tests {
} else { } else {
MultiBuffer::build_random(&mut rng, cx) MultiBuffer::build_random(&mut rng, cx)
}; };
let buffer_snapshot = buffer.read(cx).snapshot(cx); let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
log::info!("Buffer text: {:?}", buffer_snapshot.text()); log::info!("buffer text: {:?}", buffer_snapshot.text());
let (mut fold_map, _) = FoldMap::new(buffer_snapshot.clone()); let (mut fold_map, mut fold_snapshot) = FoldMap::new(buffer_snapshot.clone());
let (fold_snapshot, _) = fold_map.read(buffer_snapshot, vec![]); let (suggestion_map, mut suggestion_snapshot) = SuggestionMap::new(fold_snapshot.clone());
let suggestion_map = SuggestionMap::new(fold_snapshot.clone()); let mut suggestion_edits = Vec::new();
for _ in 0..operations { for _ in 0..operations {
let mut buffer_edits = Vec::new(); let mut buffer_edits = Vec::new();
match rng.gen_range(0..=100) { match rng.gen_range(0..=100) {
0..=59 => { 0..=29 => {
for (fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) { let new_suggestion = if rng.gen_bool(0.3) {
suggestion_map.sync(fold_snapshot, fold_edits); None
} else {
let index = rng.gen_range(0..=buffer_snapshot.len());
let len = rng.gen_range(0..30);
Some(Suggestion {
position: index,
text: util::RandomCharIter::new(&mut rng)
.take(len)
.collect::<String>()
.as_str()
.into(),
highlight_style: Default::default(),
})
};
let (new_suggestion_snapshot, edits) =
suggestion_map.replace(new_suggestion, fold_snapshot, Default::default());
suggestion_snapshot = new_suggestion_snapshot;
suggestion_edits.push(edits);
}
30..=59 => {
for (new_fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) {
fold_snapshot = new_fold_snapshot;
let (new_suggestion_snapshot, edits) =
suggestion_map.sync(fold_snapshot.clone(), fold_edits);
suggestion_snapshot = new_suggestion_snapshot;
suggestion_edits.push(edits);
} }
} }
_ => buffer.update(cx, |buffer, cx| { _ => buffer.update(cx, |buffer, cx| {
@ -346,8 +374,17 @@ mod tests {
}), }),
}; };
let (new_fold_snapshot, fold_edits) =
fold_map.read(buffer_snapshot.clone(), buffer_edits);
fold_snapshot = new_fold_snapshot;
let (new_suggestion_snapshot, edits) =
suggestion_map.sync(fold_snapshot.clone(), fold_edits);
suggestion_snapshot = new_suggestion_snapshot;
suggestion_edits.push(edits);
log::info!("buffer text: {:?}", buffer_snapshot.text()); log::info!("buffer text: {:?}", buffer_snapshot.text());
log::info!("folds text: {:?}", buffer_snapshot.text()); log::info!("folds text: {:?}", fold_snapshot.text());
log::info!("suggestions text: {:?}", suggestion_snapshot.text());
} }
} }
} }