fsprojects#1219 bug fixed

src/Fantomas.Tests/ControlStructureTests.fs

@@ -735,3 +735,104 @@ let foldi (folder: 'State -> int -> 'T -> 'State) (state: 'State) (array: 'T [])
 
         state
 """
+
+[<Test>]
+let ``line comment inside short `with` block (of a try-with), 1219`` () =
+    formatSourceString
+        false
+        """
+      try
+          //comment1
+          TrySomething(someParam)
+      with
+          //comment2
+          ex ->
+          MakeSureToCleanup(someParam)
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+try
+    //comment1
+    TrySomething(someParam)
+with
+    //comment2
+    ex -> MakeSureToCleanup(someParam)
+"""
+
+[<Test>]
+let ``line comment inside `with` block (of a try-with), 1219`` () =
+    formatSourceString
+        false
+        """module Foo =
+        let Bar () =
+            async {
+                try
+                    let! content = tryDownloadFile url
+                    return Some content
+                with
+                    // should we specify HttpRequestException?
+                    ex ->
+                        Infrastructure.ReportWarning ex
+                        return None
+            }
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+module Foo =
+    let Bar () =
+        async {
+            try
+                let! content = tryDownloadFile url
+                return Some content
+            with
+                // should we specify HttpRequestException?
+                ex ->
+                    Infrastructure.ReportWarning ex
+                    return None
+        }
+"""
+
+[<Test>]
+let ``line comment inside nested `with` block (of a try-with), 1219`` () =
+    formatSourceString
+        false
+        """
+      try
+          //comment1
+          try
+              //comment2
+              TrySomething(someParam)
+          with
+              //comment3
+              ex ->
+              MakeSureToCleanup(someParam)
+
+      with
+          ex ->
+          Infrastructure.ReportWarning ex
+          return None
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+try
+    //comment1
+    try
+        //comment2
+        TrySomething(someParam)
+    with
+        //comment3
+        ex -> MakeSureToCleanup(someParam)
+
+with ex ->
+    Infrastructure.ReportWarning ex
+    return None
+"""

src/Fantomas.Tests/TriviaTests.fs

@@ -490,65 +490,3 @@ let ``number expression`` () =
     | [ { ContentItself = Some (Number (n))
           Type = TriviaNodeType.MainNode (SynExpr_Const) } ] -> n == "2.0m"
     | _ -> fail ()
-
-[<Test>]
-let ``line comment inside short `with` block (of a try-with), 1219`` () =
-    formatSourceString
-        false
-        """
-      try
-          //humberto
-          TrySomething(someParam)
-      with
-          //comentario
-          ex ->
-          MakeSureToCleanup(someParam)
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        """
-try
-    //humberto
-    TrySomething(someParam)
-with
-    //comentario
-    ex -> MakeSureToCleanup(someParam)
-"""
-
-[<Test>]
-let ``line comment inside `with` block (of a try-with), 1219`` () =
-    formatSourceString
-        false
-        """module Foo =
-        let Bar () =
-            async {
-                try
-                    let! content = tryDownloadFile url
-                    return Some content
-                with
-                    // should we specify HttpRequestException?
-                    ex ->
-                        Infrastructure.ReportWarning ex
-                        return None
-            }
-"""
-        config
-    |> prepend newline
-    |> should
-        equal
-        """
-module Foo =
-    let Bar () =
-        async {
-            try
-                let! content = tryDownloadFile url
-                return Some content
-            with
-                // should we specify HttpRequestException?
-                ex ->
-                    Infrastructure.ReportWarning ex
-                    return None
-        }
-"""

src/Fantomas/CodePrinter.fs

@@ -2042,6 +2042,17 @@ and genExpr astContext synExpr ctx =
                 +> unindent
                 +> kw WITH !+~ "with"
 
+            let hasCommentBeforeClause (c: SynMatchClause) =
+                Map.tryFindOrEmptyList SynMatchClause_Clause ctx.TriviaMainNodes
+                |> List.filter (fun node -> RangeHelpers.rangeStartEq node.Range c.Range)
+                |> TriviaHelpers.``has sigle line comments before``
+
+            let genClause (astContext: ASTContext) (b: bool) (c: SynMatchClause) =
+                ifElse
+                    (hasCommentBeforeClause c)
+                    (indent +> genClause astContext b c +> unindent)
+                    (genClause astContext b c)
+
             match cs with
             | [ SynMatchClause.Clause (SynPat.Or _, _, _, _, _) ] ->
                 atCurrentColumn (
@@ -4092,6 +4103,7 @@ and genClause astContext hasBar (Clause (p, e, eo)) =
         { astContext with
               IsInsideMatchClausePattern = true }
 
+
     let pat =
         genPat astCtx p
         +> optPre
@@ -4101,9 +4113,9 @@ and genClause astContext hasBar (Clause (p, e, eo)) =
             (fun e -> sepSpaceOrIndentAndNlnIfExpressionExceedsPageWidth (genExpr astContext e))
         +> sepArrow
         +> leaveNodeTokenByName arrowRange RARROW
+        |> genTriviaFor SynMatchClause_Clause p.Range
 
     genTriviaBeforeClausePipe p.Range
-    +> genTriviaMainNodesBeforeClausePipe p.Range
     +> ifElse hasBar (sepBar +> atCurrentColumnWithPrepend pat body) (pat +> body)
 
 /// Each multiline member definition has a pre and post new line.

src/Fantomas/Context.fs

@@ -1448,15 +1448,6 @@ let internal genTriviaBeforeClausePipe (rangeOfClause: range) ctx =
         | None -> id
     <| ctx
 
-let internal genTriviaMainNodesBeforeClausePipe (rangeOfClause: range) ctx =
-    (Map.tryFindOrEmptyList SynMatchClause_Clause ctx.TriviaMainNodes)
-    |> List.tryFind (fun t -> RangeHelpers.rangeEq t.Range rangeOfClause)
-    |> fun trivia ->
-        match trivia with
-        | Some trivia -> indent +> (printContentBefore trivia)
-        | None -> id
-    <| ctx
-
 let internal hasLineCommentAfterInfix (rangePlusInfix: range) (ctx: Context) =
     match Map.tryFind SynExpr_Ident ctx.TriviaMainNodes with
     | Some triviaNodes ->

src/Fantomas/TriviaHelpers.fs

@@ -18,6 +18,18 @@ module internal TriviaHelpers =
         |> Option.map (fun t -> t.ContentAfter |> List.exists contentAfter)
         |> Option.defaultValue false
 
+    let ``has sigle line comments before`` (triviaNodes: TriviaNode List) =
+        triviaNodes
+        |> List.exists
+            (fun nodes ->
+                nodes.ContentBefore
+                |> List.filter
+                    (fun tn ->
+                        match tn with
+                        | Comment (LineCommentOnSingleLine _) -> true
+                        | _ -> false)
+                |> (List.isEmpty >> not))
+
     let ``has content after that ends with``
         (findTrivia: TriviaNode -> bool)
         (contentAfterEnd: TriviaContent -> bool)