Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle replacing trailing empty excerpt with another empty excerpt

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-02-09 19:38:18 +01:00
parent fab6f0c568
commit cbf59ffafb
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/editor/src/display_map/block_map.rs
View file

@ -184,20 +184,30 @@ impl BlockMap {
} }
fn sync(&self, wrap_snapshot: &WrapSnapshot, mut edits: Vec<WrapEdit>) { fn sync(&self, wrap_snapshot: &WrapSnapshot, mut edits: Vec<WrapEdit>) {
let buffer = wrap_snapshot.buffer_snapshot();
if edits.is_empty() { if edits.is_empty() {
// Handle removing the last excerpt or inserting the first excerpt when the excerpt is // Handle removing the last excerpt or inserting the first excerpt when the excerpt is
// empty. // empty.
if wrap_snapshot.max_point().is_zero() { if buffer.excerpt_update_count()
!= self
.wrap_snapshot
.lock()
.buffer_snapshot()
.excerpt_update_count()
{
let max_point = wrap_snapshot.max_point();
let edit_start = wrap_snapshot.prev_row_boundary(max_point);
let edit_end = max_point.row() + 1;
edits.push(WrapEdit { edits.push(WrapEdit {
old: 0..1, old: edit_start..edit_end,
new: 0..1, new: edit_start..edit_end,
}); });
} else { } else {
return; return;
} }
} }
let buffer = wrap_snapshot.buffer_snapshot();
let mut transforms = self.transforms.lock(); let mut transforms = self.transforms.lock();
let mut new_transforms = SumTree::new(); let mut new_transforms = SumTree::new();
let old_row_count = transforms.summary().input_rows; let old_row_count = transforms.summary().input_rows;