Pretty printer: Fix no_nl support

Author: kit-ty-kate

src/patch.ml

@@ -52,15 +52,18 @@ type hunk = {
   their : string list ;
 }
 
-let unified_diff hunk =
+let unified_diff ~mine_no_nl ~their_no_nl hunk =
+  let no_nl_str = ["\\ No newline at end of file"] in
   (* TODO *)
   String.concat "\n" (List.map (fun line -> "-" ^ line) hunk.mine @
-                      List.map (fun line -> "+" ^ line) hunk.their)
+                      (if mine_no_nl then no_nl_str else []) @
+                      List.map (fun line -> "+" ^ line) hunk.their @
+                      (if their_no_nl then no_nl_str else []))
 
-let pp_hunk ppf hunk =
+let pp_hunk ~mine_no_nl ~their_no_nl ppf hunk =
   Format.fprintf ppf "@@@@ -%d,%d +%d,%d @@@@\n%s"
     hunk.mine_start hunk.mine_len hunk.their_start hunk.their_len
-    (unified_diff hunk)
+    (unified_diff ~mine_no_nl ~their_no_nl hunk)
 
 let take data num =
   let rec take0 num data acc =
@@ -215,9 +218,16 @@ type t = {
   their_no_nl : bool ;
 }
 
-let pp ~git ppf t =
-  pp_operation ~git ppf t.operation ;
-  List.iter (pp_hunk ppf) t.hunks
+let pp ~git ppf {operation; hunks; mine_no_nl; their_no_nl} =
+  pp_operation ~git ppf operation;
+  let rec aux = function
+    | [] -> ()
+    | [x] -> pp_hunk ~mine_no_nl ~their_no_nl ppf x
+    | x::xs ->
+        pp_hunk ~mine_no_nl:false ~their_no_nl:false ppf x;
+        aux xs
+  in
+  aux hunks
 
 let operation_of_strings git mine their =
   let get_filename_opt n =

src/patch.mli

@@ -11,7 +11,7 @@ type hunk = {
 (** A hunk contains some difference between two files: each with a start line
     and length, and then the content as lists of string. *)
 
-val pp_hunk : Format.formatter -> hunk -> unit
+val pp_hunk : mine_no_nl:bool -> their_no_nl:bool -> Format.formatter -> hunk -> unit
 (** [pp_hunk ppf hunk] pretty-prints the [hunk] on [ppf], the printing is in the
     same format as [diff] does. *)
 

test/test.ml

@@ -10,7 +10,7 @@ let hunk_eq a b =
   List.for_all (fun x -> List.mem x b.mine) a.mine &&
   List.for_all (fun x -> List.mem x b.their) a.their
 
-let test_hunk = Alcotest.testable Patch.pp_hunk hunk_eq
+let test_hunk = Alcotest.testable (Patch.pp_hunk ~mine_no_nl:false ~their_no_nl:false) hunk_eq
 
 let patch_eq a b =
   let open Patch in