Trivial is simple

Author: Julow

lib/Ast.ml

@@ -1486,7 +1486,7 @@ end = struct
     | Pexp_constant {pconst_desc= Pconst_string (_, _, Some _); _} -> false
     (* Only strings fitting on the line are simple. *)
     | Pexp_constant {pconst_desc= Pconst_string (_, loc, None); _} ->
-        Location.height loc = 1 && fit_margin c (width xexp)
+        Exp.is_trivial exp || (Location.height loc = 1 && fit_margin c (width xexp))
     | Pexp_constant _ -> true
     | Pexp_field _ | Pexp_ident _ | Pexp_send _
      |Pexp_construct (_, None)

test/passing/tests/js_args.ml.ref

@@ -33,8 +33,7 @@ let () =
   messages :=
     Message_store.create (Session_id.of_string "")
       (* Tuareg indents these lines too far to the left. *)
-      "herd-retransmitter"
-      Message_store.Message_size.Byte
+      "herd-retransmitter" Message_store.Message_size.Byte
 
 let () =
   raise