Fix printing of comments with ghost unit at the end of Pexp_let

Author: Iwan

src/res_comments_table.ml

@@ -85,6 +85,7 @@ let log t =
     ]
   ) |> Doc.toString ~width:80 |> print_endline
   [@@live]
+
 let attach tbl loc comments =
   match comments with
   | [] -> ()
@@ -776,6 +777,12 @@ let rec walkStructure s t comments =
         partitionLeadingTrailing comments longident.loc in
       attach t.leading longident.loc leading;
       attach t.trailing longident.loc trailing;
+    | Pexp_let (
+        _recFlag,
+        valueBindings,
+        {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None)}
+      ) ->
+      walkValueBindings valueBindings t comments
     | Pexp_let (_recFlag, valueBindings, expr2) ->
       let comments = visitListButContinueWithRemainingComments
         ~getLoc:(fun n ->

src/res_printer.ml

@@ -90,7 +90,7 @@ let printMultilineCommentContent txt =
       Doc.text "*/";
     ]
 
-let printTrailingComment (nodeLoc : Location.t) comment =
+let printTrailingComment (prevLoc: Location.t) (nodeLoc : Location.t) comment =
   let singleLine = Comment.isSingleLineComment comment in
   let content =
     let txt = Comment.txt comment in
@@ -101,8 +101,7 @@ let printTrailingComment (nodeLoc : Location.t) comment =
   in
   let diff =
     let cmtStart = (Comment.loc comment).loc_start in
-    let prevTokEndPos = Comment.prevTokEndPos comment in
-    cmtStart.pos_lnum - prevTokEndPos.pos_lnum
+    cmtStart.pos_lnum - prevLoc.loc_end.pos_lnum
   in
   let isBelow =
     (Comment.loc comment).loc_start.pos_lnum > nodeLoc.loc_end.pos_lnum in
@@ -224,12 +223,12 @@ let printLeadingComments node tbl loc =
     loop [] comments
 
 let printTrailingComments node tbl loc =
-  let rec loop acc comments =
+  let rec loop prev acc comments =
     match comments with
     | [] -> Doc.concat (List.rev acc)
     | comment::comments ->
-      let cmtDoc = printTrailingComment loc comment in
-      loop (cmtDoc::acc) comments
+      let cmtDoc = printTrailingComment prev loc comment in
+      loop (Comment.loc comment) (cmtDoc::acc) comments
   in
   match Hashtbl.find tbl loc with
   | exception Not_found -> node
@@ -238,7 +237,7 @@ let printTrailingComments node tbl loc =
    (* Remove comments from tbl: Some ast nodes have the same location.
     * We only want to print comments once *)
     Hashtbl.remove tbl loc;
-    let cmtsDoc = loop [] comments in
+    let cmtsDoc = loop loc [] comments in
     Doc.concat [
       node;
       cmtsDoc;

tests/conversion/reason/__snapshots__/render.spec.js.snap

@@ -997,6 +997,7 @@ module type my_module_type = {
   module M: {
     @ocaml.doc(\\" The comment for value y. \\")
     let y: int
+
     /* ... */
   }
 }

tests/idempotency/lwt/core/lwt.ml

@@ -1448,10 +1448,8 @@ struct
           'a 'u 'c. packed_callbacks list -> ('a, 'u, 'c) promise ->
             packed_callbacks list =
           fun (type c) callbacks_accumulator (p : (_, _, c) promise) ->
-
         let p = underlying p in
         match p.state with
-        (* If the promise is not still pending, it can't be canceled. *)
         | Fulfilled _ ->
           callbacks_accumulator
         | Rejected _ ->

tests/printer/comments/__snapshots__/render.spec.js.snap

@@ -561,6 +561,27 @@ switch x {
 let catch = 34
 
 let promiseCatch = x => Js.Promise.catch(x)
+
+// aggregating intersections
+let () = {
+  let s = Sphere.make()
+  let i1 = make(~t=1., ~sphere=s)
+  let i2 = make(~t=2., ~sphere=s)
+
+  //  let is = interesections
+
+  //  assert
+}
+
+let () = {
+  let s = Sphere.make()
+  let i1 = make(~t=1., ~sphere=s)
+  let i2 = make(~t=2., ~sphere=s)
+
+  //  let is = interesections
+
+  //  assert
+}
 "
 `;
 

tests/printer/comments/blockExpr.res

@@ -514,4 +514,26 @@ switch x {
 
 let catch = 34
 
-let promiseCatch = x => Js.Promise.catch(x)
+let promiseCatch = x => Js.Promise.catch(x)
+
+// aggregating intersections
+let () = {
+  let s = Sphere.make()
+  let i1 = make(~t=1., ~sphere=s)
+  let i2 = make(~t=2., ~sphere=s)
+
+//  let is = interesections
+  
+//  assert 
+}
+
+let () = {
+  let s = Sphere.make()
+  let i1 = make(~t=1., ~sphere=s)
+  let i2 = make(~t=2., ~sphere=s)
+
+  ()
+//  let is = interesections
+  
+//  assert 
+}