Avoid breaking after a lone '}'

ocaml-ppx · Nov 12, 2024 · 2adb89c · 2adb89c
1 parent bed630f
commit 2adb89c
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 1 deletion.
diff --git a/lib/Fmt_ast.ml b/lib/Fmt_ast.ml
@@ -1086,7 +1086,15 @@ and fmt_pattern_attributes c xpat k =
               false
           | _ -> true )
       in
-      hvbox_if parens_attr 1
+      let box =
+        match xpat.ast.ppat_desc with
+        | (Ppat_record _ | Ppat_array _ | Ppat_list _)
+          when c.conf.fmt_opts.dock_collection_brackets.v ->
+            hovbox
+        | _ -> hvbox
+      in
+      box
+        (if parens_attr then 1 else 0)
         (Params.parens_if parens_attr c.conf
            (k $ fmt_attributes c ~pre:Space attrs) )
 

diff --git a/test/passing/tests/record-402.ml.ref b/test/passing/tests/record-402.ml.ref
@@ -67,3 +67,11 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({ foooooooooooooooooooooo
+     ; invalidation_trace
+     ; access_trace
+     ; must_be_valid_reason }
+     [@warning "+missing-record-field-pattern"] ) =
+  ()
diff --git a/test/passing/tests/record-default.ml.ref b/test/passing/tests/record-default.ml.ref
@@ -66,3 +66,12 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({
+       foooooooooooooooooooooo;
+       invalidation_trace;
+       access_trace;
+       must_be_valid_reason;
+     } [@warning "+missing-record-field-pattern"]) =
+  ()
diff --git a/test/passing/tests/record-loose.ml.ref b/test/passing/tests/record-loose.ml.ref
@@ -67,3 +67,11 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({ foooooooooooooooooooooo
+     ; invalidation_trace
+     ; access_trace
+     ; must_be_valid_reason }
+     [@warning "+missing-record-field-pattern"] ) =
+  ()
diff --git a/test/passing/tests/record-tight_decl.ml.ref b/test/passing/tests/record-tight_decl.ml.ref
@@ -67,3 +67,11 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({ foooooooooooooooooooooo
+     ; invalidation_trace
+     ; access_trace
+     ; must_be_valid_reason }
+     [@warning "+missing-record-field-pattern"] ) =
+  ()
diff --git a/test/passing/tests/record.ml b/test/passing/tests/record.ml
@@ -73,3 +73,12 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({
+       foooooooooooooooooooooo;
+       invalidation_trace;
+       access_trace;
+       must_be_valid_reason;
+     } [@warning "+missing-record-field-pattern"]) =
+  ()
diff --git a/test/passing/tests/record.ml.ref b/test/passing/tests/record.ml.ref
@@ -67,3 +67,11 @@ let _ =
         ()
   in
   ()
+
+let foo
+    ({ foooooooooooooooooooooo
+     ; invalidation_trace
+     ; access_trace
+     ; must_be_valid_reason }
+     [@warning "+missing-record-field-pattern"] ) =
+  ()