Split hunk that contains deletion

Author: cruessler

gix-blame/tests/blame.rs

@@ -517,9 +517,9 @@ fn process_change(
             }
         }
         (Some(hunk), Some(Change::Deleted(line_number_in_destination, number_of_lines_deleted))) => {
-            *offset_in_destination -= number_of_lines_deleted;
+            if line_number_in_destination < hunk.range_in_destination.start {
+                *offset_in_destination -= number_of_lines_deleted;
 
-            if hunk.range_in_destination.start > line_number_in_destination {
                 let line_range_in_next_destination =
                     LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
 
@@ -529,7 +529,30 @@ fn process_change(
                 ));
 
                 (None, None)
+            } else if line_number_in_destination < hunk.range_in_destination.end {
+                if hunk.range_in_destination.start < line_number_in_destination {
+                    let line_range_in_next_destination = LineRange::with_offset(
+                        hunk.range_in_destination.start..line_number_in_destination,
+                        *offset_in_destination,
+                    );
+
+                    new_hunks_to_blame.push(UnblamedHunk::from_destination(
+                        line_range_in_next_destination.into(),
+                        hunk.offset() + *offset_in_destination,
+                    ));
+                }
+
+                *offset_in_destination -= number_of_lines_deleted;
+
+                let new_hunk = Some(UnblamedHunk::from_destination(
+                    line_number_in_destination..hunk.range_in_destination.end,
+                    hunk.offset(),
+                ));
+
+                (new_hunk, None)
             } else {
+                *offset_in_destination -= number_of_lines_deleted;
+
                 (Some(hunk), None)
             }
         }
@@ -1418,6 +1441,35 @@ fn process_change_works_deleted_hunk_2() {
     assert_eq!(offset_in_destination, Offset::Deleted(4));
 }
 
+#[test]
+fn process_change_works_deleted_hunk_3() {
+    let mut lines_blamed: Vec<BlameEntry> = vec![];
+    let mut new_hunks_to_blame: Vec<UnblamedHunk> = vec![];
+    let mut offset_in_destination: Offset = Offset::Added(0);
+    let suspect = ObjectId::null(gix_hash::Kind::Sha1);
+
+    let (hunk, change) = process_change(
+        &mut lines_blamed,
+        &mut new_hunks_to_blame,
+        &mut offset_in_destination,
+        suspect,
+        Some(UnblamedHunk::new(2..16, Offset::Added(0))),
+        Some(Change::Deleted(14, 4)),
+    );
+
+    assert_eq!(
+        hunk,
+        Some(UnblamedHunk {
+            range_in_blamed_file: 14..16,
+            range_in_destination: 14..16
+        })
+    );
+    assert_eq!(change, None);
+    assert_eq!(lines_blamed, vec![]);
+    assert_eq!(new_hunks_to_blame, vec![UnblamedHunk::new(2..14, Offset::Added(0))]);
+    assert_eq!(offset_in_destination, Offset::Deleted(4));
+}
+
 #[test]
 fn process_changes_works() {
     let mut lines_blamed: Vec<BlameEntry> = vec![];