Allow edits at the end of `MultiBuffer`

Antonio Scandurra and Nathan Sobo created 4 years ago

Co-Authored-By: Nathan Sobo <[e-mail]>

Change summary

crates/editor/src/display_map/fold_map.rs | 2 +-
crates/editor/src/multi_buffer.rs         | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)

Detailed changes

crates/editor/src/display_map/fold_map.rs

@@ -1254,7 +1254,7 @@ mod tests {
         let buffer = if rng.gen() {
             MultiBuffer::build_simple(&text, cx)
         } else {
-            MultiBuffer::build_random(1, &mut rng, cx)
+            MultiBuffer::build_random(rng.gen_range(1..=5), &mut rng, cx)
         };
         let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
         let mut map = FoldMap::new(buffer_snapshot.clone()).0;

crates/editor/src/multi_buffer.rs

@@ -305,6 +305,9 @@ impl MultiBuffer {
             let start = range.start.to_offset(&snapshot);
             let end = range.end.to_offset(&snapshot);
             cursor.seek(&start, Bias::Right, &());
+            if cursor.item().is_none() && start == *cursor.start() {
+                cursor.prev(&());
+            }
             let start_excerpt = cursor.item().expect("start offset out of bounds");
             let start_overshoot =
                 (start - cursor.start()).saturating_sub(start_excerpt.header_height as usize);
@@ -312,6 +315,9 @@ impl MultiBuffer {
                 start_excerpt.range.start.to_offset(&start_excerpt.buffer) + start_overshoot;
 
             cursor.seek(&end, Bias::Right, &());
+            if cursor.item().is_none() && end == *cursor.start() {
+                cursor.prev(&());
+            }
             let end_excerpt = cursor.item().expect("end offset out of bounds");
             let end_overshoot =
                 (end - cursor.start()).saturating_sub(end_excerpt.header_height as usize);