Upgrade ocamlformat to 0.26.1 (rescript-lang#6493)

Author: aspeddro

.github/workflows/ci.yml

@@ -143,11 +143,23 @@ jobs:
 
  - name: Use OCaml ${{matrix.ocaml_compiler}}
  uses: ocaml/setup-ocaml@v2
+ if: matrix.os != 'windows-latest'
  with:
  ocaml-compiler: ${{matrix.ocaml_compiler}}
  opam-pin: false
  opam-depext: false
 
+ - name: Use OCaml ${{matrix.ocaml_compiler}} (Win)
+ uses: ocaml/setup-ocaml@v2
+ if: matrix.os == 'windows-latest'
+ with:
+ ocaml-compiler: ${{matrix.ocaml_compiler}}
+ opam-pin: false
+ opam-depext: false
+ opam-repositories: |
+ opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
+ default: https://github.com/ocaml/opam-repository.git
+
  - name: "Install OPAM dependencies"
  run: opam install . --deps-only
 

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.22.4
+version = 0.26.1
 
 field-space = tight-decl
 break-cases = toplevel

dune-project

@@ -21,7 +21,7 @@
  (ocaml
  (>= 4.10))
  (ocamlformat
- (= 0.22.4))
+ (= 0.26.1))
  (cppo
  (= 1.6.9))
  (js_of_ocaml-compiler

jscomp/frontend/ast_attributes.ml

@@ -41,11 +41,11 @@ let process_method_attributes_rev (attrs : t) =
  | None -> true
  | Some e -> Ast_payload.assert_bool_lit e),
  undefined )
- | "undefined" -> (
+ | "undefined" ->
  ( null,
  match opt_expr with
  | None -> true
- | Some e -> Ast_payload.assert_bool_lit e ))
+ | Some e -> Ast_payload.assert_bool_lit e )
  | "nullable" -> (
  match opt_expr with
  | None -> (true, true)

jscomp/frontend/ast_derive_abstract.ml

@@ -84,8 +84,8 @@ let handleTdcl light (tdcl : Parsetree.type_declaration) :
  Ext_list.fold_right label_declarations
  ( [],
  (if has_optional_field then
- Ast_compatible.arrow ~loc (Ast_literal.type_unit ()) core_type
- else core_type),
+  Ast_compatible.arrow ~loc (Ast_literal.type_unit ()) core_type
+  else core_type),
  [] )
  (fun ({
  pld_name = {txt = label_name; loc = label_loc} as pld_name;
@@ -109,15 +109,15 @@ let handleTdcl light (tdcl : Parsetree.type_declaration) :
  ( Ast_compatible.opt_arrow ~loc:pld_loc label_name pld_type maker,
  Val.mk ~loc:pld_loc
  (if light then pld_name
- else {pld_name with txt = pld_name.txt ^ "Get"})
+  else {pld_name with txt = pld_name.txt ^ "Get"})
  ~attrs:get_optional_attrs ~prim
  (Ast_compatible.arrow ~loc core_type optional_type)
  :: acc )
  else
  ( Ast_compatible.label_arrow ~loc:pld_loc label_name pld_type maker,
  Val.mk ~loc:pld_loc
  (if light then pld_name
- else {pld_name with txt = pld_name.txt ^ "Get"})
+  else {pld_name with txt = pld_name.txt ^ "Get"})
  ~attrs:get_attrs
  ~prim:
  ((* Not needed actually*)

jscomp/frontend/ast_derive_js_mapper.ml

@@ -213,10 +213,10 @@ let init () =
  Ast_comb.single_non_rec_value patFromJs
  (Ast_compatible.fun_ (Pat.var pat_param)
  (if createType then
- Exp.let_ Nonrecursive
- [Vb.mk (Pat.var pat_param) (exp_param +: newType)]
- (Exp.constraint_ obj_exp core_type)
- else Exp.constraint_ obj_exp core_type))
+  Exp.let_ Nonrecursive
+  [Vb.mk (Pat.var pat_param) (exp_param +: newType)]
+  (Exp.constraint_ obj_exp core_type)
+  else Exp.constraint_ obj_exp core_type))
  in
  let rest = [toJs; fromJs] in
  if createType then eraseTypeStr :: newTypeStr :: rest else rest
@@ -239,16 +239,17 @@ let init () =
  ));
  Ast_comb.single_non_rec_value {loc; txt = revMap}
  (if has_bs_as then
- Exp.extension
- ( {txt = "raw"; loc},
- PStr
- [Str.eval (Exp.constant (Const.string revData))]
- )
- else expMap);
+ Exp.extension
+ ( {txt = "raw"; loc},
+ PStr
+ [
+ Str.eval (Exp.constant (Const.string revData));
+ ] )
+ else expMap);
  toJsBody
  (if has_bs_as then
- app2 unsafeIndexGetExp expMap exp_param
- else app1 eraseTypeExp exp_param);
+  app2 unsafeIndexGetExp expMap exp_param
+  else app1 eraseTypeExp exp_param);
  Ast_comb.single_non_rec_value patFromJs
  (Ast_compatible.fun_ (Pat.var pat_param)
  (let result =

jscomp/frontend/ast_derive_projector.ml

@@ -60,32 +60,33 @@ let init () =
  Ast_comb.single_non_rec_value
  {loc; txt = little_con_name}
  (if arity = 0 then
- (*TODO: add a prefix, better inter-op with FFI *)
- Exp.constraint_
- (Exp.construct
- {loc; txt = Longident.Lident con_name}
- None)
- annotate_type
- else
- let vars =
- Ext_list.init arity (fun x ->
- "param_" ^ string_of_int x)
- in
- let exp =
- Exp.constraint_
- (Exp.construct
- {loc; txt = Longident.Lident con_name}
- @@ Some
- (if arity = 1 then
- Exp.ident {loc; txt = Lident (List.hd vars)}
- else
- Exp.tuple
- (Ext_list.map vars (fun x ->
- Exp.ident {loc; txt = Lident x}))))
- annotate_type
- in
- Ext_list.fold_right vars exp (fun var b ->
- Ast_compatible.fun_ (Pat.var {loc; txt = var}) b)))
+ (*TODO: add a prefix, better inter-op with FFI *)
+ Exp.constraint_
+ (Exp.construct
+ {loc; txt = Longident.Lident con_name}
+ None)
+ annotate_type
+ else
+ let vars =
+ Ext_list.init arity (fun x ->
+ "param_" ^ string_of_int x)
+ in
+ let exp =
+ Exp.constraint_
+ (Exp.construct
+ {loc; txt = Longident.Lident con_name}
+ @@ Some
+ (if arity = 1 then
+ Exp.ident
+ {loc; txt = Lident (List.hd vars)}
+ else
+ Exp.tuple
+ (Ext_list.map vars (fun x ->
+ Exp.ident {loc; txt = Lident x}))))
+ annotate_type
+ in
+ Ext_list.fold_right vars exp (fun var b ->
+ Ast_compatible.fun_ (Pat.var {loc; txt = var}) b)))
  | Ptype_abstract | Ptype_open ->
  Ast_derive_util.notApplicable tdcl.ptype_loc derivingName;
  []

jscomp/frontend/ast_external_process.ml

@@ -896,22 +896,22 @@ let handle_attributes (loc : Bs_loc.t) (type_annotation : Parsetree.core_type)
  let arg_label = param_type.label in
  let ty = param_type.ty in
  (if i = 0 && splice then
- match arg_label with
- | Optional _ ->
- Location.raise_errorf ~loc
- "%@variadic expect the last type to be a non optional"
- | Labelled _ | Nolabel -> (
- if ty.ptyp_desc = Ptyp_any then
+ match arg_label with
+ | Optional _ ->
  Location.raise_errorf ~loc
- "%@variadic expect the last type to be an array";
- if spec_of_ptyp true ty <> Nothing then
- Location.raise_errorf ~loc
- "%@variadic expect the last type to be an array";
- match ty.ptyp_desc with
- | Ptyp_constr ({txt = Lident "array"; _}, [_]) -> ()
- | _ ->
- Location.raise_errorf ~loc
- "%@variadic expect the last type to be an array"));
+ "%@variadic expect the last type to be a non optional"
+ | Labelled _ | Nolabel -> (
+ if ty.ptyp_desc = Ptyp_any then
+ Location.raise_errorf ~loc
+ "%@variadic expect the last type to be an array";
+ if spec_of_ptyp true ty <> Nothing then
+ Location.raise_errorf ~loc
+ "%@variadic expect the last type to be an array";
+ match ty.ptyp_desc with
+ | Ptyp_constr ({txt = Lident "array"; _}, [_]) -> ()
+ | _ ->
+ Location.raise_errorf ~loc
+ "%@variadic expect the last type to be an array"));
  let ( (arg_label : External_arg_spec.label_noname),
  arg_type,
  new_arg_types ) =
@@ -988,8 +988,7 @@ let pval_prim_of_option_labels (labels : (bool * string Asttypes.loc) list)
  (ends_with_unit : bool) =
  let arg_kinds =
  Ext_list.fold_right labels
- (if ends_with_unit then [External_arg_spec.empty_kind Extern_unit]
- else [])
+ (if ends_with_unit then [External_arg_spec.empty_kind Extern_unit] else [])
  (fun (is_option, p) arg_kinds ->
  let label_name = p.txt in
  let obj_arg_label =

jscomp/frontend/bs_builtin_ppx.ml

@@ -549,7 +549,7 @@ let rec structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t)
  (* Dynamic import of module transformation: module M = @res.await Belt.List *)
  | Pstr_module
  ({pmb_expr = {pmod_desc = Pmod_ident {txt; loc}; pmod_attributes} as me}
- as mb)
+  as mb)
  when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes ->
  let item = self.structure_item self item in
  let safe_module_type_name = local_module_type_name txt in

jscomp/frontend/external_ffi_types.ml

@@ -296,7 +296,7 @@ let inline_float_primitive (i : string) : string list =
 let rec ffi_bs_aux acc (params : External_arg_spec.params) =
  match params with
  | {arg_type = Nothing; arg_label = Arg_empty}
- (* same as External_arg_spec.dummy*)
+  (* same as External_arg_spec.dummy*)
  :: rest ->
  ffi_bs_aux (acc + 1) rest
  | _ :: _ -> -1