oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-understand that the line just below git deletion is "inside" hunk

Browse Source 
Fixes "go to previous hunk" getting stuck on a deletion, never going
further up
This commit is contained in:
Julia
2023-10-24 11:17:42 +02:00
parent 67e590202a
commit 48cdefe6cf
3 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/git.rs
+3 -3
View File
@@ -36,7 +36,7 @@ impl DisplayDiffHunk {
DisplayDiffHunk::Unfolded {
display_row_range, ..
} => display_row_range.start..=display_row_range.end - 1,
} => display_row_range.start..=display_row_range.end,
};
range.contains(&display_row)
@@ -77,8 +77,8 @@ pub fn diff_hunk_to_display(hunk: DiffHunk<u32>, snapshot: &DisplaySnapshot) ->
} else {
let start = hunk_start_point.to_display_point(snapshot).row();
let hunk_end_row_inclusive = hunk.buffer_range.end.max(hunk.buffer_range.start);
let hunk_end_point = Point::new(hunk_end_row_inclusive, 0);
let hunk_end_row = hunk.buffer_range.end.max(hunk.buffer_range.start);
let hunk_end_point = Point::new(hunk_end_row, 0);
let end = hunk_end_point.to_display_point(snapshot).row();
DisplayDiffHunk::Unfolded {