Fix offset of new hunk

Author: cruessler

gix-blame/tests/blame.rs

@@ -409,8 +409,13 @@ fn process_change(
                     //     <--->     (blamed)
                     // <-->     <->  (new hunk)
                     if added.start > hunk.range_in_destination.start {
-                        new_hunks_to_blame.push(UnblamedHunk::from_destination(
+                        let line_range_in_next_destination = LineRange::with_offset(
                             hunk.range_in_destination.start..added.start,
+                            *offset_in_destination,
+                        );
+
+                        new_hunks_to_blame.push(UnblamedHunk::from_destination(
+                            line_range_in_next_destination.into(),
                             hunk.offset() + *offset_in_destination,
                         ));
                     }
@@ -984,30 +989,30 @@ fn process_change_works_added_hunk_3() {
         &mut new_hunks_to_blame,
         &mut offset_in_destination,
         suspect,
-        Some(UnblamedHunk::new(0..5, Offset::Added(0))),
-        Some(Change::Added(2..3, 0)),
+        Some(UnblamedHunk::new(10..15, Offset::Added(0))),
+        Some(Change::Added(12..13, 0)),
     );
 
     assert_eq!(
         hunk,
         Some(UnblamedHunk {
-            range_in_blamed_file: 3..5,
-            range_in_destination: 3..5
+            range_in_blamed_file: 13..15,
+            range_in_destination: 13..15
         })
     );
     assert_eq!(change, None);
     assert_eq!(
         lines_blamed,
         vec![BlameEntry {
-            range: 2..3,
+            range: 12..13,
             commit_id: suspect
         }]
     );
     assert_eq!(
         new_hunks_to_blame,
         vec![UnblamedHunk {
-            range_in_blamed_file: 5..7,
-            range_in_destination: 0..2
+            range_in_blamed_file: 10..12,
+            range_in_destination: 5..7
         }]
     );
     assert_eq!(offset_in_destination, Offset::Added(6));
@@ -1126,6 +1131,48 @@ fn process_change_works_added_hunk_6() {
     assert_eq!(offset_in_destination, Offset::Added(2));
 }
 
+#[test]
+fn process_change_works_added_hunk_7() {
+    let mut lines_blamed: Vec<BlameEntry> = vec![];
+    let mut new_hunks_to_blame: Vec<UnblamedHunk> = vec![];
+    let mut offset_in_destination: Offset = Offset::Added(2);
+    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,
+        // range_in_destination: 2..6
+        Some(UnblamedHunk::new(3..7, Offset::Added(1))),
+        Some(Change::Added(3..5, 1)),
+    );
+
+    assert_eq!(
+        hunk,
+        Some(UnblamedHunk {
+            range_in_blamed_file: 6..7,
+            range_in_destination: 5..6
+        })
+    );
+    assert_eq!(change, None);
+    assert_eq!(
+        lines_blamed,
+        vec![BlameEntry {
+            range: 4..6,
+            commit_id: suspect
+        }]
+    );
+    assert_eq!(
+        new_hunks_to_blame,
+        vec![UnblamedHunk {
+            range_in_blamed_file: 3..4,
+            range_in_destination: 0..1
+        }]
+    );
+    assert_eq!(offset_in_destination, Offset::Added(3));
+}
+
 #[test]
 fn process_change_works_unchanged_hunk() {
     let mut lines_blamed: Vec<BlameEntry> = vec![];