Handle addition enclosing unblamed hunk

Author: cruessler

gix-blame/tests/blame.rs

@@ -537,19 +537,17 @@ fn process_change(
                     //       <---->  (added)
 
                     if added.end <= hunk.range_in_destination.start {
+                        //       <---->  (hunk)
+                        // <-->          (added)
+
                         *offset_in_destination += added.end - added.start;
                         *offset_in_destination -= number_of_lines_deleted;
-                    }
 
-                    let new_change = if added.end <= hunk.range_in_destination.start {
-                        None
-                    } else {
-                        Some(Change::Added(added.clone(), number_of_lines_deleted))
-                    };
+                        (Some(hunk.clone()), None)
+                    } else if hunk.range_in_destination.end <= added.start {
+                        // <-->          (hunk)
+                        //       <---->  (added)
 
-                    if added.end <= hunk.range_in_destination.start {
-                        (Some(hunk.clone()), new_change)
-                    } else {
                         let line_range_in_next_destination =
                             LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
 
@@ -558,7 +556,19 @@ fn process_change(
                             hunk.offset() + *offset_in_destination,
                         ));
 
-                        (None, new_change)
+                        (None, Some(Change::Added(added.clone(), number_of_lines_deleted)))
+                    } else {
+                        //    <--->      (hunk)
+                        // <---------->  (added)
+                        //    <--->      (blamed)
+
+                        lines_blamed.push(BlameEntry::with_offset(
+                            hunk.range_in_destination.clone(),
+                            suspect,
+                            hunk.offset(),
+                        ));
+
+                        (None, Some(Change::Added(added.clone(), number_of_lines_deleted)))
                     }
                 }
             }
@@ -1604,6 +1614,37 @@ fn process_change_works_no_overlap_6() {
     assert_eq!(offset_in_destination, Offset::Deleted(1));
 }
 
+#[test]
+fn process_change_works_enclosing_addition() {
+    let mut lines_blamed: Vec<BlameEntry> = vec![];
+    let mut new_hunks_to_blame: Vec<UnblamedHunk> = vec![];
+    let mut offset_in_destination: Offset = Offset::Added(3);
+    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: 5..8
+        Some(UnblamedHunk::new(2..5, Offset::Deleted(3))),
+        Some(Change::Added(3..12, 2)),
+    );
+
+    assert_eq!(hunk, None);
+    assert_eq!(change, Some(Change::Added(3..12, 2)));
+    assert_eq!(
+        lines_blamed,
+        vec![BlameEntry {
+            range_in_blamed_file: 2..5,
+            range_in_original_file: 5..8,
+            commit_id: suspect
+        }]
+    );
+    assert_eq!(new_hunks_to_blame, vec![]);
+    assert_eq!(offset_in_destination, Offset::Added(3));
+}
+
 #[test]
 fn process_change_works_unchanged_hunk() {
     let mut lines_blamed: Vec<BlameEntry> = vec![];