Indent further args of anonymous functions (#1440)

Author: gpetiot

CHANGES.md

@@ -13,6 +13,7 @@
   + Restore previous functionality for pre-post extension points (#1342, @jberdine)
 
   + Fix extra break before `function` body of a `fun` (#1343, @jberdine)
+    Indent further args of anonymous functions (#1440, @gpetiot)
 
   + Do not clear the emacs `*compilation*` buffer on successful reformat (#1350, @jberdine)
 

lib/Fmt_ast.ml

@@ -1851,10 +1851,12 @@ and fmt_expression c ?(box = true) ?pro ?epi ?eol ?parens ?(indent_wrap = 0)
                           ( fmt_args_grouped e0 e1N $ fmt "@ "
                           $ fmt_label lbl ":" $ cmts_before
                           $ hvbox 0
-                              ( str "(fun "
-                              $ fmt_attributes c ~key:"@" eN1.pexp_attributes
-                                  ~suf:(str " ")
-                              $ fmt_fun_args c xargs $ fmt_opt fmt_cstr
+                              ( hvbox 2
+                                  ( fmt "(fun@ "
+                                  $ fmt_attributes c ~key:"@"
+                                      eN1.pexp_attributes ~suf:(str " ")
+                                  $ fmt_fun_args c xargs $ fmt_opt fmt_cstr
+                                  )
                               $ fmt "@ ->" ) )
                       $ fmt
                           ( match xbody.ast.pexp_desc with

lib/Source.ml

@@ -153,9 +153,10 @@ let extend_loc_to_include_attributes t (loc : Location.t)
   else
     let last_loc =
       List.fold l ~init:loc
-        ~f:(fun (acc : Location.t)
-           ({attr_name= {loc; _}; attr_payload= payload; _} :
-             Parsetree.attribute)
+        ~f:(fun
+             (acc : Location.t)
+             ({attr_name= {loc; _}; attr_payload= payload; _} :
+               Parsetree.attribute)
            ->
           if loc.loc_ghost then acc
           else