Pick tests added in #2544 (#2588)

This will make the changes in #2544 easier to interpret.

test/passing/tests/break_fun_decl-fit_or_vertical.ml.ref

@@ -134,3 +134,20 @@ let f
     (module Store : Irmin.Generic_key.S with type repo = repo)
     (module Store : Irmin.Generic_key.S with type repo = repo) =
   body
+
+(* Inconsistent formatting of fun arguments. *)
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun new_inner_var______ (definition : Definition.t) :
+         Flambda.specialised_to -> () )
+    foo
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun
+      new_inner_var______
+      (definition : Definition.t)
+      :
+      Flambda.specialised_to
+    -> () )

test/passing/tests/break_fun_decl-smart.ml.ref

@@ -127,3 +127,20 @@ let f
     (module Store : Irmin.Generic_key.S with type repo = repo)
     (module Store : Irmin.Generic_key.S with type repo = repo) =
   body
+
+(* Inconsistent formatting of fun arguments. *)
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun new_inner_var______ (definition : Definition.t) :
+         Flambda.specialised_to -> () )
+    foo
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun
+      new_inner_var______
+      (definition : Definition.t)
+      :
+      Flambda.specialised_to
+    -> () )

test/passing/tests/break_fun_decl-wrap.ml.ref

@@ -108,3 +108,20 @@ let _ =
 let f (module Store : Irmin.Generic_key.S with type repo = repo)
     (module Store : Irmin.Generic_key.S with type repo = repo) =
   body
+
+(* Inconsistent formatting of fun arguments. *)
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun new_inner_var______ (definition : Definition.t) :
+         Flambda.specialised_to -> () )
+    foo
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun
+      new_inner_var______
+      (definition : Definition.t)
+      :
+      Flambda.specialised_to
+    -> () )

test/passing/tests/break_fun_decl.ml

@@ -108,3 +108,20 @@ let _ =
 let f (module Store : Irmin.Generic_key.S with type repo = repo)
     (module Store : Irmin.Generic_key.S with type repo = repo) =
   body
+
+(* Inconsistent formatting of fun arguments. *)
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun new_inner_var______ (definition : Definition.t) :
+         Flambda.specialised_to -> () )
+    foo
+
+let new_specialised_args =
+  Variable.Map.mapi
+    (fun
+      new_inner_var______
+      (definition : Definition.t)
+      :
+      Flambda.specialised_to
+    -> () )

test/passing/tests/class_expr.ml

@@ -5,3 +5,13 @@ class c `I = x
 class c i = x
 
 class c (* xx *) i (* yy *) = x
+
+class c =
+  object
+    method class_infos : 'a. ('a -> 'res) -> 'a class_infos -> 'res =
+      fun _a
+          {pci_virt; pci_params; pci_name; pci_expr; pci_loc; pci_attributes} ->
+        let pci_virt = self#virtual_flag pci_virt in
+        let pci_params = self#list in
+        ()
+  end

test/passing/tests/class_expr.ml.err

@@ -0,0 +1 @@
+Warning: tests/class_expr.ml:12 exceeds the margin

test/passing/tests/fun_decl.ml

@@ -102,3 +102,16 @@ let space_break =
   with_pp (fun fs ->
       Box_debug.space_break fs ;
       Format_.pp_print_space fs () )
+
+let _ =
+  (fun k ->
+    let _ = 42 in
+    () )
+  @@ ()
+
+let _ =
+  let _ = () in
+  fun (context : Context.t)
+      ~(local_bins : origin Appendable_list.t Filename.Map.t Memo.Lazy.t) ->
+    let _ = () in
+    ()

test/passing/tests/function_indent-never.ml.ref

@@ -23,3 +23,19 @@ let foooooooo =
   else function
     | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
     | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
+
+let _ =
+  { foo=
+      (fun _ -> function
+        | _ ->
+            let _ = 42 in
+            ()
+        | () -> () ) }
+
+let _ =
+  match () with
+  | _ -> (
+      f
+      >>= function
+      | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+      | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2 )

test/passing/tests/function_indent.ml

@@ -24,3 +24,21 @@ let foooooooo =
     function
     | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
     | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
+
+let _ =
+  { foo =
+      (fun _ -> function
+         | _ ->
+           let _ = 42 in
+           ()
+         | () -> ())
+  }
+;;
+
+let _ =
+  match () with
+  | _ -> (
+      f
+      >>= function
+      | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+      | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2 )

test/passing/tests/function_indent.ml.ref

@@ -23,3 +23,19 @@ let foooooooo =
   else function
         | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
         | fooooooooooooooooooooooo -> foooooooooooooooooooooooooo
+
+let _ =
+  { foo=
+      (fun _ -> function
+          | _ ->
+              let _ = 42 in
+              ()
+          | () -> () ) }
+
+let _ =
+  match () with
+  | _ -> (
+      f
+      >>= function
+          | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+          | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2 )

test/passing/tests/js_source.ml

@@ -8193,3 +8193,40 @@ end
     ]
   ;;
 *)
+
+let _ =
+  { foo =
+      (fun _ -> function
+         | _ ->
+           let _ = 42 in
+           ()
+         | () -> ())
+  }
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+     | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+     | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+     | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+     | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+    >>= foo
+;;
+
+let exists t key =
+  S.Tree.kind t.tree (path key)
+  >|= function
+  | Some `Contents -> Ok (Some `Value)
+  | Some `Node -> Ok (Some `Dictionary)
+  | None -> Ok None
+;;

test/passing/tests/js_source.ml.ocp

@@ -10476,3 +10476,40 @@ module type M = sig
 end
 
 (*$ let _ = [ x (* *); y ] *)
+
+let _ =
+  { foo =
+      (fun _ -> function
+         | _ ->
+           let _ = 42 in
+           ()
+         | () -> ())
+  }
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+      | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+      | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+      | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+      | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+    >>= foo
+;;
+
+let exists t key =
+  S.Tree.kind t.tree (path key)
+  >|= function
+  | Some `Contents -> Ok (Some `Value)
+  | Some `Node -> Ok (Some `Dictionary)
+  | None -> Ok None
+;;

test/passing/tests/js_source.ml.ref

@@ -10476,3 +10476,40 @@ module type M = sig
 end
 
 (*$ let _ = [ x (* *); y ] *)
+
+let _ =
+  { foo =
+      (fun _ -> function
+         | _ ->
+           let _ = 42 in
+           ()
+         | () -> ())
+  }
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+     | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+     | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+;;
+
+let _ =
+  match () with
+  | _ ->
+    f
+    >>= (function
+           | `Fooooooooooooooooooooooooooooooooooooooo -> 1
+           | `Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar -> 2)
+    >>= foo
+;;
+
+let exists t key =
+  S.Tree.kind t.tree (path key)
+  >|= function
+  | Some `Contents -> Ok (Some `Value)
+  | Some `Node -> Ok (Some `Dictionary)
+  | None -> Ok None
+;;

test/passing/tests/labelled_args-414.ml.ref

@@ -18,3 +18,22 @@ let () =
         very_long_argument_name_two
         very_long_argument_name_three
       -> () )
+
+let () =
+  very_long_function_name
+    ~very_long_argument_label:(fun
+        very_long_argument_name_one
+        very_long_argument_name_two
+        very_long_argument_name_three
+      -> () )
+    foo
+
+let () =
+  very_long_function_name
+    ~very_long_argument_label:(* foo *)
+      (fun
+        very_long_argument_name_one
+        very_long_argument_name_two
+        very_long_argument_name_three
+      -> () )
+    foo

test/passing/tests/labelled_args.ml

@@ -18,3 +18,22 @@ let () =
         very_long_argument_name_two
         very_long_argument_name_three
       -> () )
+
+let () =
+  very_long_function_name
+    ~very_long_argument_label:(fun
+        very_long_argument_name_one
+        very_long_argument_name_two
+        very_long_argument_name_three
+      -> () )
+    foo
+
+let () =
+  very_long_function_name
+    ~very_long_argument_label:(* foo *)
+      (fun
+        very_long_argument_name_one
+        very_long_argument_name_two
+        very_long_argument_name_three
+      -> () )
+    foo

test/passing/tests/source-conventional.ml.ref

@@ -8697,3 +8697,12 @@ let eradicate_meta_class_is_nullsafe =
     ~enabled:false Info
 
 let () = match () with _ -> ( fun _ : _ -> match () with _ -> ()) | _ -> ()
+
+let f = function
+  | Foo -> bar
+  | EArr l ->
+      EArr
+        (List.map l ~f:(function
+          | ElementHole -> ElementHole
+          | Element e -> Element (m#expression e)
+          | ElementSpread e -> ElementSpread (m#expression e)))

test/passing/tests/source.ml

@@ -7423,3 +7423,12 @@ let () =
      | _ -> ())
   | _ -> ()
 ;;
+
+let f = function
+  | Foo -> bar
+  | EArr l ->
+      EArr
+        (List.map l ~f:(function
+          | ElementHole -> ElementHole
+          | Element e -> Element (m#expression e)
+          | ElementSpread e -> ElementSpread (m#expression e)))

test/passing/tests/source.ml.ref

@@ -9201,3 +9201,12 @@ let eradicate_meta_class_is_nullsafe =
 
 let () =
   match () with _ -> ( fun _ : _ -> match () with _ -> () ) | _ -> ()
+
+let f = function
+  | Foo -> bar
+  | EArr l ->
+      EArr
+        (List.map l ~f:(function
+          | ElementHole -> ElementHole
+          | Element e -> Element (m#expression e)
+          | ElementSpread e -> ElementSpread (m#expression e) ) )