mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-11 12:46:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Make remote edit randomized tests pass with locators

Browse source
This commit is contained in:
Antonio Scandurra 2021-12-09 09:15:19 +01:00
parent b4ebe179f9
commit dc81b5f57a
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/text/src/tests.rs
View file

@ -579,6 +579,7 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
} }
_ => {} _ => {}
} }
buffer.check_invariants();
if mutation_count == 0 && network.is_idle() { if mutation_count == 0 && network.is_idle() {
break; break;
@ -605,6 +606,7 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
.all_selection_ranges::<usize>() .all_selection_ranges::<usize>()
.collect::<HashMap<_, _>>() .collect::<HashMap<_, _>>()
); );
buffer.check_invariants();
} }
} }

47
crates/text/src/text.rs
View file

@ -827,6 +827,8 @@ impl Buffer {
let mut edits = Patch::default(); let mut edits = Patch::default();
let cx = Some(version.clone()); let cx = Some(version.clone());
let mut new_insertions = Vec::new();
let mut insertion_offset = 0;
let mut new_ropes = let mut new_ropes =
RopeBuilder::new(self.visible_text.cursor(0), self.deleted_text.cursor(0)); RopeBuilder::new(self.visible_text.cursor(0), self.deleted_text.cursor(0));
let mut old_fragments = self.fragments.cursor::<(VersionedFullOffset, usize)>(); let mut old_fragments = self.fragments.cursor::<(VersionedFullOffset, usize)>();
@ -850,6 +852,9 @@ impl Buffer {
if fragment_end > fragment_start { if fragment_end > fragment_start {
let mut suffix = old_fragments.item().unwrap().clone(); let mut suffix = old_fragments.item().unwrap().clone();
suffix.len = fragment_end.0 - fragment_start.0; suffix.len = fragment_end.0 - fragment_start.0;
suffix.insertion_offset +=
fragment_start - old_fragments.start().0.full_offset();
new_insertions.push(InsertionFragment::insert_new(&suffix));
new_ropes.push_fragment(&suffix, suffix.visible); new_ropes.push_fragment(&suffix, suffix.visible);
new_fragments.push(suffix, &None); new_fragments.push(suffix, &None);
} }
@ -868,6 +873,8 @@ impl Buffer {
if fragment_end == range.start && fragment_end > fragment_start { if fragment_end == range.start && fragment_end > fragment_start {
let mut fragment = old_fragments.item().unwrap().clone(); let mut fragment = old_fragments.item().unwrap().clone();
fragment.len = fragment_end.0 - fragment_start.0; fragment.len = fragment_end.0 - fragment_start.0;
fragment.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
new_insertions.push(InsertionFragment::insert_new(&fragment));
new_ropes.push_fragment(&fragment, fragment.visible); new_ropes.push_fragment(&fragment, fragment.visible);
new_fragments.push(fragment, &None); new_fragments.push(fragment, &None);
old_fragments.next(&cx); old_fragments.next(&cx);
@ -894,6 +901,9 @@ impl Buffer {
if fragment_start < range.start { if fragment_start < range.start {
let mut prefix = old_fragments.item().unwrap().clone(); let mut prefix = old_fragments.item().unwrap().clone();
prefix.len = range.start.0 - fragment_start.0; prefix.len = range.start.0 - fragment_start.0;
prefix.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
prefix.id = Locator::between(&new_fragments.summary().max_id, &prefix.id);
new_insertions.push(InsertionFragment::insert_new(&prefix));
fragment_start = range.start; fragment_start = range.start;
new_ropes.push_fragment(&prefix, prefix.visible); new_ropes.push_fragment(&prefix, prefix.visible);
new_fragments.push(prefix, &None); new_fragments.push(prefix, &None);
@ -910,19 +920,24 @@ impl Buffer {
old: old_start..old_start, old: old_start..old_start,
new: new_start..new_start + new_text.len(), new: new_start..new_start + new_text.len(),
}); });
let fragment = Fragment {
id: Locator::between(
&new_fragments.summary().max_id,
old_fragments
.item()
.map_or(&Locator::max(), |old_fragment| &old_fragment.id),
),
insertion_timestamp: timestamp,
insertion_offset,
len: new_text.len(),
deletions: Default::default(),
max_undos: Default::default(),
visible: true,
};
new_insertions.push(InsertionFragment::insert_new(&fragment));
new_ropes.push_str(new_text); new_ropes.push_str(new_text);
new_fragments.push( new_fragments.push(fragment, &None);
Fragment { insertion_offset += new_text.len();
id: todo!(),
insertion_timestamp: timestamp,
insertion_offset: todo!(),
len: new_text.len(),
deletions: Default::default(),
max_undos: Default::default(),
visible: true,
},
&None,
);
} }
// Advance through every fragment that intersects this range, marking the intersecting // Advance through every fragment that intersects this range, marking the intersecting
@ -934,6 +949,10 @@ impl Buffer {
let intersection_end = cmp::min(range.end, fragment_end); let intersection_end = cmp::min(range.end, fragment_end);
if fragment.was_visible(version, &self.undo_map) { if fragment.was_visible(version, &self.undo_map) {
intersection.len = intersection_end.0 - fragment_start.0; intersection.len = intersection_end.0 - fragment_start.0;
intersection.insertion_offset +=
fragment_start - old_fragments.start().0.full_offset();
intersection.id =
Locator::between(&new_fragments.summary().max_id, &intersection.id);
intersection.deletions.insert(timestamp.local()); intersection.deletions.insert(timestamp.local());
intersection.visible = false; intersection.visible = false;
} }
@ -947,6 +966,7 @@ impl Buffer {
new: new_start..new_start, new: new_start..new_start,
}); });
} }
new_insertions.push(InsertionFragment::insert_new(&intersection));
new_ropes.push_fragment(&intersection, fragment.visible); new_ropes.push_fragment(&intersection, fragment.visible);
new_fragments.push(intersection, &None); new_fragments.push(intersection, &None);
fragment_start = intersection_end; fragment_start = intersection_end;
@ -964,6 +984,8 @@ impl Buffer {
if fragment_end > fragment_start { if fragment_end > fragment_start {
let mut suffix = old_fragments.item().unwrap().clone(); let mut suffix = old_fragments.item().unwrap().clone();
suffix.len = fragment_end.0 - fragment_start.0; suffix.len = fragment_end.0 - fragment_start.0;
suffix.insertion_offset += fragment_start - old_fragments.start().0.full_offset();
new_insertions.push(InsertionFragment::insert_new(&suffix));
new_ropes.push_fragment(&suffix, suffix.visible); new_ropes.push_fragment(&suffix, suffix.visible);
new_fragments.push(suffix, &None); new_fragments.push(suffix, &None);
} }
@ -979,6 +1001,7 @@ impl Buffer {
self.snapshot.fragments = new_fragments; self.snapshot.fragments = new_fragments;
self.snapshot.visible_text = visible_text; self.snapshot.visible_text = visible_text;
self.snapshot.deleted_text = deleted_text; self.snapshot.deleted_text = deleted_text;
self.snapshot.insertions.edit(new_insertions, &());
self.local_clock.observe(timestamp.local()); self.local_clock.observe(timestamp.local());
self.lamport_clock.observe(timestamp.lamport()); self.lamport_clock.observe(timestamp.lamport());
self.update_subscriptions(edits); self.update_subscriptions(edits);