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

Fix issues with adjacent diff hunks (#25367)

Browse source 
Closes #ISSUE

Release Notes:

- Fixed being unable to toggle diff hunks with the mouse in some cases
This commit is contained in:
Cole Miller 2025-02-21 19:07:04 -05:00 • committed by GitHub
parent 4118f42d61
commit ef53f7af22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 193 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/editor/src/editor.rs
View file

@ -12990,14 +12990,13 @@ impl Editor {
})
}
fn toggle_diff_hunks_in_ranges_narrow(
&mut self,
ranges: Vec<Range<Anchor>>,
cx: &mut Context<'_, Editor>,
) {
fn toggle_single_diff_hunk(&mut self, range: Range<Anchor>, cx: &mut Context<Self>) {
self.buffer.update(cx, |buffer, cx| {
let expand = !buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx);
buffer.expand_or_collapse_diff_hunks_narrow(ranges, expand, cx);
let snapshot = buffer.snapshot(cx);
let excerpt_id = range.end.excerpt_id;
let point_range = range.to_point(&snapshot);
let expand = !buffer.single_hunk_is_expanded(range, cx);
buffer.expand_or_collapse_diff_hunks_inner([(point_range, excerpt_id)], expand, cx);
})
}