v0.17~preview.129.15+205

Author: public-release

README.mdx

@@ -15,7 +15,11 @@ let f
   ~path
   ()
   =
-  let prev_contents = Stdio.In_channel.with_file path ~f:Stdio.In_channel.input_all in
+  let prev_contents =
+    if Stdlib.Sys.file_exists path
+    then Stdio.In_channel.with_file path ~f:Stdio.In_channel.input_all
+    else ""
+  in
   match String.( = ) prev_contents next_contents with
   | true ->
     (* It's possible for stale .corrected files to linger and ideally we would delete them

README.org

@@ -204,25 +204,28 @@ let transform_let_expect ~trailing_location ~tags ~expected_exn ~description ~lo
   let trailing_test_id = Expectation_id.mint () in
   let exn_test_id = Expectation_id.mint () in
   [%expr
-    let module Ppx_expect_test_block =
-      Ppx_expect_runtime.Make_test_block (Expect_test_config)
-    in
-    Ppx_expect_test_block.run_suite
-      ~filename_rel_to_project_root:[%e estring ~loc filename_rel_to_project_root]
-      ~line_number:[%e eint ~loc loc.loc_start.pos_lnum]
-      ~location:[%e Expr.compact_loc ~loc (compact_loc_of_ppxlib_location loc)]
-      ~trailing_loc:[%e Expr.compact_loc ~loc trailing_location]
-      ~body_loc:[%e Expr.compact_loc ~loc body_loc]
-      ~formatting_flexibility:[%e Expr.flexibility_of_strictness ~loc]
-      ~expected_exn:[%e Expr.(option ~loc (pair payload compact_loc)) expected_exn]
-      ~trailing_test_id:[%e Expr.id ~loc trailing_test_id]
-      ~exn_test_id:[%e Expr.id ~loc exn_test_id]
-      ~description:[%e Expr.option estring ~loc description]
-      ~tags:[%e tags |> List.map ~f:(estring ~loc) |> elist ~loc]
-      ~inline_test_config:(module Inline_test_config)
-      ~expectations:
-        [%e Merlin_helpers.hide_expression (Expr.id_expr_alist ~loc expectations)]
-      (fun () -> [%e body])]
+    match Ppx_inline_test_lib.testing with
+    | `Not_testing -> ()
+    | `Testing _ ->
+      let module Ppx_expect_test_block =
+        Ppx_expect_runtime.Make_test_block (Expect_test_config)
+      in
+      Ppx_expect_test_block.run_suite
+        ~filename_rel_to_project_root:[%e estring ~loc filename_rel_to_project_root]
+        ~line_number:[%e eint ~loc loc.loc_start.pos_lnum]
+        ~location:[%e Expr.compact_loc ~loc (compact_loc_of_ppxlib_location loc)]
+        ~trailing_loc:[%e Expr.compact_loc ~loc trailing_location]
+        ~body_loc:[%e Expr.compact_loc ~loc body_loc]
+        ~formatting_flexibility:[%e Expr.flexibility_of_strictness ~loc]
+        ~expected_exn:[%e Expr.(option ~loc (pair payload compact_loc)) expected_exn]
+        ~trailing_test_id:[%e Expr.id ~loc trailing_test_id]
+        ~exn_test_id:[%e Expr.id ~loc exn_test_id]
+        ~description:[%e Expr.option estring ~loc description]
+        ~tags:[%e tags |> List.map ~f:(estring ~loc) |> elist ~loc]
+        ~inline_test_config:(module Inline_test_config)
+        ~expectations:
+          [%e Merlin_helpers.hide_expression (Expr.id_expr_alist ~loc expectations)]
+        (fun () -> [%e body])]
 ;;
 
 let let_expect_pat =

make-corrected-file/make_corrected_file.ml

@@ -34,10 +34,10 @@ let%expect_test (_ [@tags "no-js"]) =
   print_slot trace 5;
   [%expect
     {|
-      (* expect_test_collector: This test expectation appears to contain a backtrace.
-         This is strongly discouraged as backtraces are fragile.
-         Please change this test to not include a backtrace. *)
+    (* expect_test_collector: This test expectation appears to contain a backtrace.
+       This is strongly discouraged as backtraces are fragile.
+       Please change this test to not include a backtrace. *)
 
-      Raised by primitive operation at Ppx_expect_test__Bad_test.get_a_trace.loop in file "bad_test.ml", line 12, characters 17-29
+    Raised by primitive operation at Ppx_expect_test__Bad_test.get_a_trace.loop in file "bad_test.ml", line 12, characters 17-29
     |}]
 ;;

src/ppx_expect.ml

@@ -1,6 +1,6 @@
 let%expect_test "escaped carriage return" =
   print_string "a\r\nb";
-  [%expect "\na\r\nb"];
+  [%expect " \n a\n b\n "];
   print_string "a\r\nb";
   [%expect_exact "a\r\nb"]
 ;;
@@ -21,7 +21,7 @@ let%expect_test "escaped quote" =
 
 let%expect_test "escaped trailing carriage return" =
   print_string "a\r\nb\r\n";
-  [%expect "\na\r\nb\r"];
+  [%expect " \n a\n b\n "];
   print_string "a\r\nb\r\n";
   [%expect_exact "a\r\nb\r\n"]
 ;;

test/bad_test.ml

@@ -3,7 +3,5 @@
 let%expect_test _ =
   print_string "hello world\n";
   Unix.chdir "..";
-  [%expect {|
-  hello world
-|}]
+  [%expect {| hello world |}]
 ;;

test/escaped_strings.ml

@@ -10,7 +10,8 @@ let%expect_test "foo" =
   pr (Sexp.to_string (sexp_of_t [ 1; 2; 3 ]));
   [%expect {|
     line1
-    (1 2 3) |}]
+    (1 2 3)
+    |}]
 ;;
 
 let%expect_test _ =