s/needs_raw_cmts_after_kw/is_special_or_nested_special_beginend/g

MisterDA · MisterDA · commit f365c507eaee · 2026-06-02T10:19:48.000+02:00
diff --git a/lib/Fmt_ast.ml b/lib/Fmt_ast.ml
@@ -2562,7 +2562,7 @@ and fmt_expression c ?(box = true) ?(pro = noop) ?eol ?parens
                          let cmts_after_kw, raw_cmts_after_kw =
                            if Cmts.has_after c.cmts keyword_loc then
                              if
-                               Params.needs_raw_cmts_after_kw
+                               Params.is_special_or_nested_special_beginend
                                  xbch.ast.pexp_desc
                              then
                                ( None
diff --git a/lib/Params.ml b/lib/Params.ml
@@ -512,15 +512,9 @@ let is_special_beginend exp =
   | Pexp_match _ | Pexp_try _ | Pexp_function _ | Pexp_ifthenelse _ -> true
   | _ -> false
 
-let needs_raw_cmts_after_kw = function
-  | Pexp_beginend
-      ( { pexp_desc=
-            Pexp_match _ | Pexp_try _ | Pexp_function _ | Pexp_ifthenelse _
-        ; _ }
-      , _ )
-   |Pexp_match _ | Pexp_try _ | Pexp_function _ | Pexp_ifthenelse _ ->
-      true
-  | _ -> false
+let is_special_or_nested_special_beginend = function
+  | Pexp_beginend ({pexp_desc; _}, _) -> is_special_beginend pexp_desc
+  | exp -> is_special_beginend exp
 
 let raw_cmts_branch_pro (c : Conf.t) cmts =
   match c.fmt_opts.if_then_else.v with
@@ -942,7 +936,7 @@ let get_if_then_else (c : Conf.t) ~cmts_before_opt ~pro ~first ~last
           (not has_beginend) && (not parens_bch)
           && (not (Location.is_single_line expr_loc c.fmt_opts.margin.v))
           && (not has_cmts_after_kw)
-          && needs_raw_cmts_after_kw xbch.ast.pexp_desc
+          && is_special_or_nested_special_beginend xbch.ast.pexp_desc
         then
           match cmts_before_opt xbch.ast.pexp_loc with
           | Some cmts -> break 1000 0 $ cmts $ break 1000 0
diff --git a/lib/Params.mli b/lib/Params.mli
@@ -237,9 +237,9 @@ val get_if_then_else :
   -> if_then_else
 (** [cmts_before_opt] return the comment before the given location with no breaks around it. *)
 
-val needs_raw_cmts_after_kw : expression_desc -> bool
-(** [needs_raw_cmts_after_kw desc] returns [true] when comments after the
-    keyword should be extracted without breaks (raw) to prevent oscillation
+val is_special_or_nested_special_beginend : expression_desc -> bool
+(** [is_special_or_nested_special_beginend] returns [true] when comments after
+    the keyword should be extracted without breaks (raw) to prevent oscillation
     between "after keyword" and "before expression" placements. *)
 
 val raw_cmts_branch_pro : Conf.t -> Fmt.t -> Fmt.t
