yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Fix a panic in spacer_blocks (#48753)

Browse Source 
Closes ZED-4X5

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Cole Miller authored and GitHub committed 2026-02-09 10:34:55 -05:00
1 parent 165b404460
commit 8582ca68a5
2 files changed
+5 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/editor/src/display_map/block_map.rs
+3 -3
View File
@@ -1335,7 +1335,7 @@ impl BlockMap {
&mut our_wrapper,
&mut companion_wrapper,
current_boundary,
current_range.end,
current_range.end.min(excerpt.target_excerpt_range.end),
delta,
);
@@ -1368,7 +1368,7 @@ impl BlockMap {
&mut our_wrapper,
&mut companion_wrapper,
current_boundary,
current_range.start,
current_range.start.min(excerpt.target_excerpt_range.end),
delta,
);
delta = delta_at_start;
@@ -1408,7 +1408,7 @@ impl BlockMap {
&mut our_wrapper,
&mut companion_wrapper,
current_boundary,
current_range.end,
current_range.end.min(excerpt.target_excerpt_range.end),
delta,
);
delta = delta_at_end;
crates/editor/src/split.rs
+2 -10
View File
@@ -250,16 +250,8 @@ fn patch_for_excerpt(
.skip_while(|edit| edit.old.end < source_excerpt_start_in_buffer)
.take_while(|edit| edit.old.start <= source_excerpt_end_in_buffer)
.map(|edit| {
let clamped_source_start = edit
.old
.start
.max(source_excerpt_start_in_buffer)
.min(source_excerpt_end_in_buffer);
let clamped_source_end = edit
.old
.end
.max(source_excerpt_start_in_buffer)
.min(source_excerpt_end_in_buffer);
let clamped_source_start = edit.old.start.max(source_excerpt_start_in_buffer);
let clamped_source_end = edit.old.end.min(source_excerpt_end_in_buffer);
let source_multibuffer_start = source_excerpt_start_in_multibuffer
+ (clamped_source_start - source_excerpt_start_in_buffer);
let source_multibuffer_end = source_excerpt_start_in_multibuffer