Skip to content

Commit 575c83e

Browse files
committed
Fix formatting
1 parent 1ea732e commit 575c83e

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

src/frontend/query_commands.ml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,16 @@ let dispatch pipeline (type a) : a Query_protocol.t -> a = function
751751
let structures = Mbrowse.enclosing pos [ Mbrowse.of_typedtree typedtree ] in
752752
begin
753753
match structures with
754-
| (_, (Browse_raw.Module_expr { mod_desc = Tmod_typed_hole; _ } as node_for_loc))
754+
| ( _,
755+
(Browse_raw.Module_expr { mod_desc = Tmod_typed_hole; _ } as
756+
node_for_loc) )
755757
:: (_, node)
756758
:: _parents ->
757759
let loc = Mbrowse.node_loc node_for_loc in
758760
(loc, Construct.node ~config ~keywords ?depth ~values_scope node)
759-
| (_, (Browse_raw.Expression { exp_desc = (Texp_typed_hole | Texp_hole _); _ } as node))
761+
| ( _,
762+
(Browse_raw.Expression { exp_desc = Texp_typed_hole | Texp_hole _; _ }
763+
as node) )
760764
:: _parents ->
761765
let loc = Mbrowse.node_loc node in
762766
(loc, Construct.node ~config ~keywords ?depth ~values_scope node)

src/kernel/mconfig.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ let ocaml_ignored_parametrized_flags =
691691
"-zero-alloc-checker-join";
692692
"-dgranularity";
693693
"-flambda2-expert-cont-lifting-budget";
694-
"-vectorize-max-block-size";
694+
"-vectorize-max-block-size"
695695
]
696696

697697
let ocaml_warnings_spec ~error =

src/ocaml/merlin_specific/browse_raw.ml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,12 @@ let rec of_expression_desc loc = function
419419
| Texp_unboxed_field (e, _, lid_loc, lbl, _) ->
420420
of_expression e ** of_exp_record_field e lid_loc lbl Unboxed_product
421421
| Texp_setfield (e1, _, lid_loc, lbl, e2) ->
422-
of_expression e1 ** of_expression e2 ** of_exp_record_field e1 lid_loc lbl Legacy
422+
of_expression e1 ** of_expression e2
423+
** of_exp_record_field e1 lid_loc lbl Legacy
423424
| Texp_ifthenelse (e1, e2, None)
424425
| Texp_sequence (e1, _, e2)
425426
| Texp_while { wh_cond = e1; wh_body = e2; _ }
426-
| Texp_overwrite (e1, e2) ->
427-
of_expression e1 ** of_expression e2
427+
| Texp_overwrite (e1, e2) -> of_expression e1 ** of_expression e2
428428
| Texp_ifthenelse (e1, e2, Some e3)
429429
| Texp_for { for_from = e1; for_to = e2; for_body = e3; _ } ->
430430
of_expression e1 ** of_expression e2 ** of_expression e3
@@ -680,8 +680,8 @@ let of_node = function
680680
| Type_kind (Ttype_abstract | Ttype_open) -> id_fold
681681
| Type_kind (Ttype_variant cds) ->
682682
list_fold (fun cd -> app (Constructor_declaration cd)) cds
683-
| Type_kind (Ttype_record lds)
684-
| Type_kind (Ttype_record_unboxed_product lds) -> list_fold of_label_declaration lds
683+
| Type_kind (Ttype_record lds) | Type_kind (Ttype_record_unboxed_product lds)
684+
-> list_fold of_label_declaration lds
685685
| Type_extension { tyext_params; tyext_constructors } ->
686686
list_fold of_typ_param tyext_params
687687
** list_fold (fun ec -> app (Extension_constructor ec)) tyext_constructors
@@ -992,9 +992,10 @@ let all_holes (env, node) =
992992
let rec aux acc (env, node) =
993993
let f env node acc =
994994
match node with
995-
| Expression { exp_desc = Texp_typed_hole; exp_loc; exp_type; exp_env; _ } ->
996-
(exp_loc, exp_env, `Exp exp_type) :: acc
997-
| Module_expr { mod_desc = Tmod_typed_hole; mod_loc; mod_type; mod_env; _ } ->
995+
| Expression { exp_desc = Texp_typed_hole; exp_loc; exp_type; exp_env; _ }
996+
-> (exp_loc, exp_env, `Exp exp_type) :: acc
997+
| Module_expr
998+
{ mod_desc = Tmod_typed_hole; mod_loc; mod_type; mod_env; _ } ->
998999
(mod_loc, mod_env, `Mod mod_type) :: acc
9991000
| _ -> aux acc (env, node)
10001001
in

0 commit comments

Comments
 (0)