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

Don't re-wrap unneccessarily on expanding hunks (#23796)

Browse source 
Co-Authored-By: Max <max@zed.dev>

Release Notes:

- N/A

Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2025-01-28 12:15:47 -07:00 • committed by GitHub
parent 7b901caf8f
commit 2b677736bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2253,46 +2253,34 @@ impl MultiBuffer {
let snapshot = self.snapshot.borrow_mut(); let snapshot = self.snapshot.borrow_mut();
let mut excerpt_edits = Vec::new(); let mut excerpt_edits = Vec::new();
for range in ranges.iter() { for range in ranges.iter() {
let end_excerpt_id = range.end.excerpt_id;
let range = range.to_point(&snapshot); let range = range.to_point(&snapshot);
let mut peek_end = range.end;
let mut start = snapshot.anchor_before(Point::new(range.start.row, 0)); if range.end.row < snapshot.max_row().0 {
let mut end = snapshot.anchor_before(Point::new( peek_end = Point::new(range.end.row + 1, 0);
range.end.row,
snapshot.line_len(MultiBufferRow(range.end.row)),
));
let peek_end = if range.end.row < snapshot.max_row().0 {
Point::new(range.end.row + 1, 0)
} else {
range.end
}; };
for diff_hunk in snapshot.diff_hunks_in_range(range.start..peek_end) { for diff_hunk in snapshot.diff_hunks_in_range(range.start..peek_end) {
if diff_hunk.row_range.start.0 <= range.start.row if diff_hunk.excerpt_id.cmp(&end_excerpt_id, &snapshot).is_gt() {
&& diff_hunk.row_range.end.0 >= range.start.row continue;
&& diff_hunk.excerpt_id == start.excerpt_id
{
start = Anchor::in_buffer(
diff_hunk.excerpt_id,
diff_hunk.buffer_id,
diff_hunk.buffer_range.start,
);
}
if diff_hunk.row_range.start.0 <= peek_end.row
&& diff_hunk.excerpt_id == end.excerpt_id
{
end = Anchor::in_buffer(
diff_hunk.excerpt_id,
diff_hunk.buffer_id,
diff_hunk.buffer_range.end,
);
} }
let start = Anchor::in_buffer(
diff_hunk.excerpt_id,
diff_hunk.buffer_id,
diff_hunk.buffer_range.start,
);
let end = Anchor::in_buffer(
diff_hunk.excerpt_id,
diff_hunk.buffer_id,
diff_hunk.buffer_range.end,
);
let start = snapshot.excerpt_offset_for_anchor(&start);
let end = snapshot.excerpt_offset_for_anchor(&end);
excerpt_edits.push(text::Edit {
old: start..end,
new: start..end,
});
} }
let start = snapshot.excerpt_offset_for_anchor(&start);
let end = snapshot.excerpt_offset_for_anchor(&end);
excerpt_edits.push(text::Edit {
old: start..end,
new: start..end,
});
} }
self.sync_diff_transforms( self.sync_diff_transforms(