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

Change fragment's visibility only if it was visible at a version

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-04 11:07:52 +02:00
parent 9bf3038857
commit ec07b8ca1d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
zed/src/editor/buffer.rs
View file

@ -1225,7 +1225,7 @@ impl Buffer {
let fragment_end = old_fragments.end(&cx).offset(); let fragment_end = old_fragments.end(&cx).offset();
let mut intersection = fragment.clone(); let mut intersection = fragment.clone();
let intersection_end = cmp::min(range.end, fragment_end); let intersection_end = cmp::min(range.end, fragment_end);
if fragment_end > old_fragments.start().offset() { if fragment.was_visible(version, &self.undo_map) {
intersection.len = intersection_end - fragment_start; intersection.len = intersection_end - fragment_start;
intersection.deletions.insert(local_timestamp); intersection.deletions.insert(local_timestamp);
intersection.visible = false; intersection.visible = false;
@ -1348,9 +1348,6 @@ impl Buffer {
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 version_after_edit = edit.version.clone();
version_after_edit.observe(edit.id);
for range in &edit.ranges { for range in &edit.ranges {
let mut end_offset = old_fragments.end(&version).offset(); let mut end_offset = old_fragments.end(&version).offset();
@ -1368,7 +1365,9 @@ impl Buffer {
if let Some(fragment) = old_fragments.item() { if let Some(fragment) = old_fragments.item() {
let mut fragment = fragment.clone(); let mut fragment = fragment.clone();
let fragment_was_visible = fragment.visible; let fragment_was_visible = fragment.visible;
if version_after_edit.observed(fragment.insertion_id) { if fragment.was_visible(&edit.version, &self.undo_map)
|| fragment.insertion_id == edit.id
{
fragment.visible = fragment.is_visible(&self.undo_map); fragment.visible = fragment.is_visible(&self.undo_map);
fragment.max_undos.observe(undo.id); fragment.max_undos.observe(undo.id);
} }
@ -1527,7 +1526,7 @@ impl Buffer {
let fragment_end = old_fragments.end(&None).visible; let fragment_end = old_fragments.end(&None).visible;
let mut intersection = fragment.clone(); let mut intersection = fragment.clone();
let intersection_end = cmp::min(range.end, fragment_end); let intersection_end = cmp::min(range.end, fragment_end);
if fragment_end > old_fragments.start().visible { if fragment.visible {
intersection.len = intersection_end - fragment_start; intersection.len = intersection_end - fragment_start;
intersection.deletions.insert(local_timestamp); intersection.deletions.insert(local_timestamp);
intersection.visible = false; intersection.visible = false;
@ -3425,7 +3424,7 @@ mod tests {
pub fn randomly_undo_redo(&mut self, rng: &mut impl Rng) -> Vec<Operation> { pub fn randomly_undo_redo(&mut self, rng: &mut impl Rng) -> Vec<Operation> {
let mut ops = Vec::new(); let mut ops = Vec::new();
for _ in 0..rng.gen_range(1..5) { for _ in 0..rng.gen_range(1..=5) {
if let Some(edit_id) = self.history.ops.keys().choose(rng).copied() { if let Some(edit_id) = self.history.ops.keys().choose(rng).copied() {
log::info!("undoing buffer {} operation {:?}", self.replica_id, edit_id); log::info!("undoing buffer {} operation {:?}", self.replica_id, edit_id);
ops.push(self.undo_or_redo(edit_id).unwrap()); ops.push(self.undo_or_redo(edit_id).unwrap());