Apply offset to chunk after deletion

Author: cruessler

gix-blame/tests/blame.rs

@@ -261,7 +261,7 @@ fn blame_works() {
 enum Change {
     Unchanged(Range<u32>),
     Added(Range<u32>, u32),
-    Deleted(u32),
+    Deleted(u32, u32),
 }
 
 struct ChangeRecorder {
@@ -300,7 +300,8 @@ impl Sink for ChangeRecorder {
                     .push(Change::Added(after.start..after.end, before.end - before.start));
             }
             (true, false) => {
-                self.changes.push(Change::Deleted(before.end - before.start));
+                self.changes
+                    .push(Change::Deleted(after.start, before.end - before.start));
             }
             (false, false) => unimplemented!(),
         }
@@ -515,10 +516,22 @@ fn process_change(
                 }
             }
         }
-        (Some(hunk), Some(Change::Deleted(number_of_lines_deleted))) => {
+        (Some(hunk), Some(Change::Deleted(line_number_in_destination, number_of_lines_deleted))) => {
             *offset_in_destination -= number_of_lines_deleted;
 
-            (Some(hunk), None)
+            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);
+
+                new_hunks_to_blame.push(UnblamedHunk::from_destination(
+                    line_range_in_next_destination.into(),
+                    hunk.offset() + *offset_in_destination,
+                ));
+
+                (None, None)
+            } else {
+                (Some(hunk), None)
+            }
         }
         (Some(hunk), None) => {
             new_hunks_to_blame.push(UnblamedHunk::new(
@@ -1366,7 +1379,7 @@ fn process_change_works_deleted_hunk() {
         &mut offset_in_destination,
         suspect,
         Some(UnblamedHunk::new(0..5, Offset::Added(0))),
-        Some(Change::Deleted(3)),
+        Some(Change::Deleted(5, 3)),
     );
 
     assert_eq!(
@@ -1382,6 +1395,29 @@ fn process_change_works_deleted_hunk() {
     assert_eq!(offset_in_destination, Offset::Deleted(3));
 }
 
+#[test]
+fn process_change_works_deleted_hunk_2() {
+    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(0, 4)),
+    );
+
+    assert_eq!(hunk, None);
+    assert_eq!(change, None);
+    assert_eq!(lines_blamed, vec![]);
+    assert_eq!(new_hunks_to_blame, vec![UnblamedHunk::new(2..16, Offset::Deleted(4))]);
+    assert_eq!(offset_in_destination, Offset::Deleted(4));
+}
+
 #[test]
 fn process_changes_works() {
     let mut lines_blamed: Vec<BlameEntry> = vec![];
@@ -1669,7 +1705,7 @@ fn process_changes_works_deleted_hunk() {
         UnblamedHunk::new(0..4, Offset::Added(0)),
         UnblamedHunk::new(4..7, Offset::Added(0)),
     ];
-    let changes: Vec<Change> = vec![Change::Deleted(3), Change::Added(0..4, 0)];
+    let changes: Vec<Change> = vec![Change::Deleted(0, 3), Change::Added(0..4, 0)];
     let suspect = ObjectId::null(gix_hash::Kind::Sha1);
     let new_hunks_to_blame = process_changes(&mut lines_blamed, hunks_to_blame, changes, suspect);