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

Fix handling of excerpts surrounded by edits in MultiBuffer::edit

Browse source
This commit is contained in:
Max Brunsfeld 2021-12-15 12:12:39 -08:00
parent 4bea16eb31
commit 2930ea8fb0
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/editor/src/multi_buffer.rs
View file

@ -352,13 +352,10 @@ impl MultiBuffer {
if excerpt.id == end_excerpt.id { if excerpt.id == end_excerpt.id {
break; break;
} }
let excerpt_range = start_excerpt.range.end.to_offset(&start_excerpt.buffer)
..start_excerpt.range.end.to_offset(&start_excerpt.buffer);
buffer_edits buffer_edits
.entry(excerpt.buffer_id) .entry(excerpt.buffer_id)
.or_insert(Vec::new()) .or_insert(Vec::new())
.push((excerpt_range, false)); .push((excerpt.range.to_offset(&excerpt.buffer), false));
cursor.next(&()); cursor.next(&());
} }
} }
@ -386,7 +383,7 @@ impl MultiBuffer {
insertions.push( insertions.push(
buffer.anchor_before(range.start)..buffer.anchor_before(range.end), buffer.anchor_before(range.start)..buffer.anchor_before(range.end),
); );
} else { } else if !range.is_empty() {
deletions.push( deletions.push(
buffer.anchor_before(range.start)..buffer.anchor_before(range.end), buffer.anchor_before(range.start)..buffer.anchor_before(range.end),
); );