Improve indentation of attributes in patterns (#2613)

Julow · web-flow · commit fb9b70ff1d51 · 2024-11-12T16:55:14.000+01:00
* Improve indentation of attributes in patterns Small bug fix: let pp f ({cf_assign_last_arg; cf_injected_destructor; cf_interface} - [@warning "+9"] ) = + [@warning "+9"] ) = () * Avoid breaking after a lone '}'
diff --git a/CHANGES.md b/CHANGES.md
@@ -110,6 +110,7 @@ profile. This started with version 0.26.0.
 - Fix missing parentheses around a let in class expressions (#2599, @Julow)
 - Fix formatting of paragraphs in lists in documentation (#2607, @Julow)
 - Avoid unwanted space in references and links text in documentation (#2608, @Julow)
+- \* Improve the indentation of attributes in patterns (#2613, @Julow)
 - \* Avoid large indentation in patterns after `let%ext` (#2615, @Julow)
 
 ## 0.26.2 (2024-04-18)
diff --git a/lib/Fmt_ast.ml b/lib/Fmt_ast.ml
@@ -1086,8 +1086,15 @@ and fmt_pattern_attributes c xpat k =
               false
           | _ -> true )
       in
-      Params.parens_if parens_attr c.conf
-        (k $ fmt_attributes c ~pre:Space attrs)
+      let box =
+        match (xpat.ast.ppat_desc, c.conf.fmt_opts.sequence_style.v) with
+        | (Ppat_record _ | Ppat_array _ | Ppat_list _), `Terminator -> 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) )
 
 and fmt_pattern ?ext c ?pro ?parens ?(box = false)
     ({ctx= ctx0; ast= pat} as xpat) =
diff --git a/test/passing/tests/attributes.ml b/test/passing/tests/attributes.ml
@@ -364,14 +364,15 @@ let pp f ({cf_interface; cf_is_objc_block; cf_virtual} [@warning "+9"]) = ()
 
 let pp f
     ({cf_assign_last_arg; cf_injected_destructor; cf_interface}
-      [@warning "+9"] ) =
+     [@warning "+9"] ) =
   ()
 
 let pp f
     ({ cf_assign_last_arg
      ; cf_injected_destructor
      ; cf_interface
-     ; cf_is_objc_block } [@warning "+9"] ) =
+     ; cf_is_objc_block }
+     [@warning "+9"] ) =
   ()
 
 let _ = f ((* comments *) "c" [@attributes])
diff --git a/test/passing/tests/js_source.ml.err b/test/passing/tests/js_source.ml.err
@@ -1,5 +1,5 @@
-Warning: tests/js_source.ml:9564 exceeds the margin
-Warning: tests/js_source.ml:9668 exceeds the margin
-Warning: tests/js_source.ml:9727 exceeds the margin
-Warning: tests/js_source.ml:9810 exceeds the margin
-Warning: tests/js_source.ml:10308 exceeds the margin
+Warning: tests/js_source.ml:9563 exceeds the margin
+Warning: tests/js_source.ml:9667 exceeds the margin
+Warning: tests/js_source.ml:9726 exceeds the margin
+Warning: tests/js_source.ml:9809 exceeds the margin
+Warning: tests/js_source.ml:10307 exceeds the margin
diff --git a/test/passing/tests/js_source.ml.ocp b/test/passing/tests/js_source.ml.ocp
@@ -118,8 +118,7 @@ let () =
     match[@foo] () with
     | [%foo?
              (* Pattern expressions *)
-             ((lazy x)
-              [@foo])] -> ()
+             ((lazy x) [@foo])] -> ()
     | [%foo? ((exception x) [@foo])] -> ()]
 ;;
 
diff --git a/test/passing/tests/js_source.ml.ref b/test/passing/tests/js_source.ml.ref
@@ -118,8 +118,7 @@ let () =
     match[@foo] () with
     | [%foo?
         (* Pattern expressions *)
-        ((lazy x)
-        [@foo])] -> ()
+        ((lazy x) [@foo])] -> ()
     | [%foo? ((exception x) [@foo])] -> ()]
 ;;
 
diff --git a/test/passing/tests/let_binding-deindent-fun.ml.ref b/test/passing/tests/let_binding-deindent-fun.ml.ref
@@ -248,7 +248,8 @@ let copy from ~into : unit =
        ; pulse_summaries_count
        ; topl_reachable_calls
        ; timeouts
-       ; timings } [@warning "+9"] ) =
+       ; timings }
+       [@warning "+9"] ) =
     ()
   in
   ()
diff --git a/test/passing/tests/let_binding-in_indent.ml.ref b/test/passing/tests/let_binding-in_indent.ml.ref
@@ -248,7 +248,8 @@ let copy from ~into : unit =
        ; pulse_summaries_count
        ; topl_reachable_calls
        ; timeouts
-       ; timings } [@warning "+9"] ) =
+       ; timings }
+       [@warning "+9"] ) =
     ()
   in
       ()
diff --git a/test/passing/tests/let_binding-indent.ml.ref b/test/passing/tests/let_binding-indent.ml.ref
@@ -248,7 +248,8 @@ let copy from ~into : unit =
            ; pulse_summaries_count
            ; topl_reachable_calls
            ; timeouts
-           ; timings } [@warning "+9"] ) =
+           ; timings }
+           [@warning "+9"] ) =
             ()
       in
       ()
diff --git a/test/passing/tests/let_binding.ml.ref b/test/passing/tests/let_binding.ml.ref
@@ -248,7 +248,8 @@ let copy from ~into : unit =
        ; pulse_summaries_count
        ; topl_reachable_calls
        ; timeouts
-       ; timings } [@warning "+9"] ) =
+       ; timings }
+       [@warning "+9"] ) =
     ()
   in
   ()
diff --git a/test/passing/tests/list_normalized.ml.ref b/test/passing/tests/list_normalized.ml.ref
@@ -47,8 +47,7 @@ let
     (*a*)
     [ x (*b*)
     ; (*c*)
-      (y
-      [@attr] )
+      (y [@attr])
       (*d*)
       (*e*) ] (*f*) =
   e
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"] ) =
+  ()
diff --git a/test/passing/tests/shortcut_ext_attr.ml b/test/passing/tests/shortcut_ext_attr.ml
@@ -31,8 +31,7 @@ let () =
     match[@foo] () with
     | [%foo?
         (* Pattern expressions *)
-        ((lazy x)
-        [@foo] )] ->
+        ((lazy x) [@foo])] ->
         ()
     | [%foo? ((exception x) [@foo])] -> ()]
 
diff --git a/test/passing/tests/source-conventional.ml.err b/test/passing/tests/source-conventional.ml.err
@@ -1,5 +1,5 @@
-Warning: tests/source.ml:926 exceeds the margin
-Warning: tests/source.ml:1001 exceeds the margin
-Warning: tests/source.ml:6621 exceeds the margin
-Warning: tests/source.ml:7079 exceeds the margin
-Warning: tests/source.ml:8656 exceeds the margin
+Warning: tests/source.ml:925 exceeds the margin
+Warning: tests/source.ml:1000 exceeds the margin
+Warning: tests/source.ml:6620 exceeds the margin
+Warning: tests/source.ml:7078 exceeds the margin
+Warning: tests/source.ml:8655 exceeds the margin
diff --git a/test/passing/tests/source-conventional.ml.ref b/test/passing/tests/source-conventional.ml.ref
@@ -115,8 +115,7 @@ let () =
     match[@foo] () with
     | [%foo?
         (* Pattern expressions *)
-        ((lazy x)
-        [@foo])] ->
+        ((lazy x) [@foo])] ->
         ()
     | [%foo? ((exception x) [@foo])] -> ()]
 
diff --git a/test/passing/tests/source.ml.err b/test/passing/tests/source.ml.err
@@ -1,3 +1,3 @@
-Warning: tests/source.ml:702 exceeds the margin
-Warning: tests/source.ml:2319 exceeds the margin
-Warning: tests/source.ml:9158 exceeds the margin
+Warning: tests/source.ml:701 exceeds the margin
+Warning: tests/source.ml:2318 exceeds the margin
+Warning: tests/source.ml:9157 exceeds the margin
diff --git a/test/passing/tests/source.ml.ref b/test/passing/tests/source.ml.ref
@@ -128,8 +128,7 @@ let () =
     match[@foo] () with
     | [%foo?
         (* Pattern expressions *)
-        ((lazy x)
-        [@foo] )] ->
+        ((lazy x) [@foo])] ->
         ()
     | [%foo? ((exception x) [@foo])] -> ()]
 
