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

Fix panic when multi-cursor edit attempted in deleted hunk (#23633)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2025-01-24 16:14:19 -07:00 • committed by GitHub
parent ba16b4eb65
commit b7c6ffa6c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 48 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/multi_buffer/src/multi_buffer.rs
View file

@ -796,7 +796,7 @@ impl MultiBuffer {
for (ix, (range, new_text)) in edits.into_iter().enumerate() {
let original_indent_column = original_indent_columns.get(ix).copied().unwrap_or(0);
cursor.seek_forward(&range.start);
cursor.seek(&range.start);
let mut start_region = cursor.region().expect("start offset out of bounds");
if !start_region.is_main_buffer {
cursor.next();
@ -2266,7 +2266,7 @@ impl MultiBuffer {
diff_hunk.buffer_range.start,
);
}
if diff_hunk.row_range.start.0 == peek_end.row
if diff_hunk.row_range.start.0 <= peek_end.row
&& diff_hunk.excerpt_id == end.excerpt_id
{
end = Anchor::in_buffer(