fix dropped comments in Ppat_construct

ocaml-ppx · May 29, 2019 · 6d4d0d1 · 6d4d0d1
1 parent e91acd0
commit 6d4d0d1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/src/Fmt_ast.ml b/src/Fmt_ast.ml
@@ -851,23 +851,26 @@ and fmt_pattern c ?pro ?parens ({ctx= ctx0; ast= pat} as xpat) =
   | Ppat_construct (lid, None) -> fmt_longident_loc c lid
   | Ppat_construct
       ( {txt= Lident "::"; loc}
-      , Some {ppat_desc= Ppat_tuple [x; y]; ppat_attributes= []} ) -> (
+      , Some {ppat_desc= Ppat_tuple [x; y]; ppat_attributes= []; ppat_loc}
+      ) -> (
     match Sugar.list_pat c.cmts pat with
     | Some (loc_xpats, nil_loc) ->
         let fmt_pat (locs, xpat) =
           Cmts.fmt_list c ~eol:(fmt "@;<1 2>") locs @@ fmt_pattern c xpat
         in
         hvbox 0
-          (wrap_list c
-             ( list loc_xpats "@,; " fmt_pat
-             $ Cmts.fmt_before c ~pro:(fmt "@;<1 2>") ~epi:noop nil_loc
-             $ Cmts.fmt_after c ~pro:(fmt "@ ") ~epi:noop nil_loc ))
+          (Cmts.fmt c ppat_loc
+             (wrap_list c
+                ( list loc_xpats "@,; " fmt_pat
+                $ Cmts.fmt_before c ~pro:(fmt "@;<1 2>") ~epi:noop nil_loc
+                $ Cmts.fmt_after c ~pro:(fmt "@ ") ~epi:noop nil_loc )))
     | None ->
         hvbox 0
           (wrap_if parens "(" ")"
-             ( fmt_pattern c (sub_pat ~ctx x)
-             $ Cmts.fmt c ~pro:(str " ") ~epi:noop loc (fmt "@ :: ")
-             $ fmt_pattern c (sub_pat ~ctx y) )) )
+             (Cmts.fmt c ppat_loc
+                ( fmt_pattern c (sub_pat ~ctx x)
+                $ Cmts.fmt c ~pro:(str " ") ~epi:noop loc (fmt "@ :: ")
+                $ fmt_pattern c (sub_pat ~ctx y) ))) )
   | Ppat_construct (lid, Some pat) ->
       cbox 2
         (wrap_if parens "(" ")"

diff --git a/test/passing/comments.ml b/test/passing/comments.ml
@@ -152,3 +152,8 @@ let () =
   xxxxxxxxxx
   land (* xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *)
     xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+let rec fooooooooooo = function
+  | ((*XX*) (x :: t) (*YY*)) -> k
+  | (* AA*) ((*BB*) [(* CC *)x(* DD *) ; (* EE *)y(* FF *)] (* GG *)) (* HH *) -> k
+  | (* AA*) ((*BB*) ((* CC *)x(* DD *) :: (* EE *)t(* FF *)) (* GG *)) (* HH *) -> k
diff --git a/test/passing/comments.ml.opts b/test/passing/comments.ml.opts
@@ -1 +1 @@
---max-iter=3
+--max-iter=4
diff --git a/test/passing/comments.ml.ref b/test/passing/comments.ml.ref
@@ -192,3 +192,22 @@ let () =
   xxxxxxxxxx
   land (* xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx *)
        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+let rec fooooooooooo = function
+  (*XX*)
+  | x :: t (*YY*) -> k
+  (* AA*)
+  (*BB*)
+  (* CC *)
+  | [x (* DD *); (* EE *) y (* FF *)]
+  (* GG *)
+  (* HH *) ->
+      k
+  (* AA*)
+  (*BB*)
+  (* CC *)
+  | x (* DD *) :: (* EE *) t
+  (* FF *)
+  (* GG *)
+  (* HH *) ->
+      k