chore: update ocamlformat to 0.21.0

Author: rgrinberg

.ocamlformat

@@ -1,4 +1,6 @@
-version=0.19.0
+version=0.21.0
+profile=conventional
+ocaml-version=4.14.0
 break-separators=before
 dock-collection-brackets=false
 break-sequences=true
@@ -8,12 +10,12 @@ let-and=sparse
 sequence-style=terminator
 type-decl=sparse
 wrap-comments=true
-if-then-else=k-r
 let-and=sparse
 space-around-records
 space-around-lists
 space-around-arrays
 cases-exp-indent=2
-break-cases=all
+break-cases=fit-or-vertical
 indicate-nested-or-patterns=unsafe-no
 parse-docstrings=true
+module-item-spacing=sparse

fiber-test/fiber_test.ml

@@ -41,8 +41,8 @@ let test ?(expect_never = false) to_dyn f =
     in
     Fiber.with_error_handler f ~on_error
   in
-  (try Scheduler.run (Scheduler.create ()) f |> to_dyn |> print_dyn with
-  | Scheduler.Never -> never_raised := true);
+  (try Scheduler.run (Scheduler.create ()) f |> to_dyn |> print_dyn
+   with Scheduler.Never -> never_raised := true);
   match (!never_raised, expect_never) with
   | false, false ->
     (* We don't raise in this case b/c we assume something else is being

jsonrpc-fiber/src/import.ml

@@ -64,8 +64,7 @@ module Log = struct
       (match message.payload with
       | [] -> ()
       | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields));
-      Format.pp_print_flush !out ()
-    )
+      Format.pp_print_flush !out ())
 end
 
 let sprintf = Printf.sprintf

jsonrpc-fiber/src/jsonrpc_fiber.ml

@@ -23,12 +23,9 @@ module Sender = struct
 
   let send t (r : Response.t) : unit Fiber.t =
     Fiber.of_thunk (fun () ->
-        if t.called then
-          Code_error.raise "cannot send response twice" []
-        else if not (Id.equal t.for_ r.id) then
-          Code_error.raise "invalid id" []
-        else
-          t.called <- true;
+        if t.called then Code_error.raise "cannot send response twice" []
+        else if not (Id.equal t.for_ r.id) then Code_error.raise "invalid id" []
+        else t.called <- true;
         t.send r)
 end
 
@@ -122,8 +119,7 @@ struct
 
   let stop_pending_requests t =
     Fiber.of_thunk (fun () ->
-        if t.pending_requests_stopped then
-          Fiber.return ()
+        if t.pending_requests_stopped then Fiber.return ()
         else (
           t.pending_requests_stopped <- true;
           let to_cancel =
@@ -132,8 +128,7 @@ struct
           in
           Id.Table.clear t.pending;
           Fiber.parallel_iter to_cancel ~f:(fun ivar ->
-              Fiber.Ivar.fill ivar (Error `Stopped))
-        ))
+              Fiber.Ivar.fill ivar (Error `Stopped))))
 
   let create ?(on_request = on_request_fail)
       ?(on_notification = on_notification_fail) ~name chan state =
@@ -214,8 +209,7 @@ struct
         Fiber.map_reduce_errors
           (module Stdune.Monoid.Unit)
           ~on_error:(fun exn_bt ->
-            if !sent then
-              (* TODO log *)
+            if !sent then (* TODO log *)
               Fiber.return ()
             else
               let response = response_of_exn r.id exn_bt in

jsonrpc-fiber/test/jsonrpc_fiber_tests.ml

@@ -27,10 +27,8 @@ let no_output () =
   let received_none = ref false in
   Out.create (function
     | None ->
-      if !received_none then
-        failwith "received None more than once"
-      else
-        received_none := true;
+      if !received_none then failwith "received None more than once"
+      else received_none := true;
       Fiber.return ()
     | Some _ -> failwith "unexpected element")
 
@@ -158,9 +156,8 @@ let%expect_test "concurrent requests" =
               let self = Context.session c in
               print_endline "waitee: stopping";
               let+ () = Jrpc.stop self in
-              print_endline "waitee: stopped"
-            ) else
-              Fiber.return ())
+              print_endline "waitee: stopped")
+            else Fiber.return ())
       in
       let state = Context.state c in
       Fiber.return (response, state)

jsonrpc/src/jsonrpc.ml

@@ -95,10 +95,8 @@ module Message = struct
       let jsonrpc =
         Json.field_exn fields Constant.jsonrpc Json.Conv.string_of_yojson
       in
-      if jsonrpc = Constant.jsonrpcv then
-        { method_; params; id }
-      else
-        Json.error "invalid version" json
+      if jsonrpc = Constant.jsonrpcv then { method_; params; id }
+      else Json.error "invalid version" json
     | _ -> Json.error "invalid request" json
 
   let yojson_of_either t : Json.t = yojson_of_t (Option.map ~f:Id.yojson_of_t) t
@@ -237,8 +235,7 @@ module Response = struct
       let jsonrpc =
         Json.field_exn fields Constant.jsonrpc Json.Conv.string_of_yojson
       in
-      if jsonrpc <> Constant.jsonrpcv then
-        Json.error "Invalid response" json
+      if jsonrpc <> Constant.jsonrpcv then Json.error "Invalid response" json
       else
         match Json.field fields Constant.result (fun x -> x) with
         | Some res -> { id; result = Ok res }

lsp-fiber/src/import.ml

@@ -31,8 +31,7 @@ module Log = struct
       (match message.payload with
       | [] -> ()
       | fields -> Format.fprintf !out "%a@." Json.pp (`Assoc fields));
-      Format.pp_print_flush !out ()
-    )
+      Format.pp_print_flush !out ())
 end
 
 let sprintf = Stdune.sprintf

lsp-fiber/src/rpc.ml

@@ -414,8 +414,8 @@ module Server = struct
             t.state <- Running;
             (* XXX Should we wait for the waiter of initialized to finish? *)
             let* () = Fiber.Ivar.fill t.initialized i in
-            Fiber.return result
-          ) else
+            Fiber.return result)
+          else
             let code = Response.Error.Code.InvalidRequest in
             let message = "already initialized" in
             raise
@@ -428,8 +428,7 @@ module Server = struct
             raise
               (Jsonrpc.Response.Error.E
                  (Jsonrpc.Response.Error.make ~code ~message ()))
-          else
-            handler.h_on_request.on_request t in_r)
+          else handler.h_on_request.on_request t in_r)
 
   let make (type s) (handler : s Handler.t) io (initial_state : s) =
     let h_on_request : _ Handler.on_request =

lsp/bin/ocaml/json_gen.ml

@@ -87,8 +87,7 @@ module Enum = struct
             Create (Constr { tag = "Other"; poly; args = [ Create s ] })
           in
           clauses @ [ (pat, make) ]
-        else
-          clauses
+        else clauses
       in
       let msg =
         sprintf "Invalid value. Expected one of: %s"
@@ -116,8 +115,7 @@ module Enum = struct
             Create (Constr { tag = "String"; poly = true; args = [ Create s ] })
           in
           clauses @ [ (pat, make) ]
-        else
-          clauses
+        else clauses
       in
       Match (Create (Ident name), clauses)
     in
@@ -138,10 +136,7 @@ module Poly_variant = struct
   let split_clauses constrs =
     let json_constrs, untagged_constrs =
       List.partition_map constrs ~f:(fun x ->
-          if is_json_constr x then
-            Left x
-          else
-            Right x)
+          if is_json_constr x then Left x else Right x)
     in
     { json_constrs; untagged_constrs }
 

lsp/bin/ocaml/ml.ml

@@ -31,12 +31,7 @@ module Kind = struct
 end
 
 let is_kw = function
-  | "type"
-  | "method"
-  | "end"
-  | "to"
-  | "external" ->
-    true
+  | "type" | "method" | "end" | "to" | "external" -> true
   | _ -> false
 
 module Arg = struct
@@ -369,11 +364,7 @@ module Expr = struct
   let pp_constr f { tag; poly; args } =
     let tag =
       let tag = String.capitalize tag in
-      Pp.verbatim
-        (if poly then
-          "`" ^ tag
-        else
-          tag)
+      Pp.verbatim (if poly then "`" ^ tag else tag)
     in
     match args with
     | [] -> tag
@@ -402,10 +393,7 @@ module Expr = struct
     | Bool b -> Pp.textf "%b" b
     | Int i ->
       let pp = Pp.textf "%i" i in
-      if i < 0 then
-        W.surround `Paren pp
-      else
-        pp
+      if i < 0 then W.surround `Paren pp else pp
     | String s -> Pp.textf "%S" s
     | Ident s -> Pp.verbatim s
     | Cons _ -> assert false
@@ -419,10 +407,8 @@ module Expr = struct
         Pp.concat_map fields
           ~sep:(Pp.verbatim ";" ++ Pp.space)
           ~f:(fun (name, expr) ->
-            if expr = Create (Ident name) then
-              pp expr
-            else
-              Pp.verbatim name ++ Pp.space ++ Pp.verbatim "=" ++ pp expr)
+            if expr = Create (Ident name) then pp expr
+            else Pp.verbatim name ++ Pp.space ++ Pp.verbatim "=" ++ pp expr)
       in
       W.surround `Curly record
     | Constr c -> pp_constr pp c
@@ -493,14 +479,12 @@ module Expr = struct
           | Labeled (l, r) ->
             if l = r then
               Pp.concat [ Pp.textf "~(%s :" l; typ; Pp.verbatim ")" ]
-            else
-              assert false
+            else assert false
           | Optional (l, r) ->
             if l = r then
               Pp.concat
                 [ Pp.textf "?(%s :" l; typ; Pp.space; Pp.verbatim "option)" ]
-            else
-              assert false)
+            else assert false)
     in
     let body = pp body in
     let type_ = Type.pp type_ ~kind in