Trivia before bar of try with clause should indent. Fixes fsprojects#…

…1686.

src/Fantomas.Tests/ControlStructureTests.fs

@@ -958,6 +958,75 @@ with
 :? FileNotFoundException -> false
 """
 
+[<Test>]
+let ``comment above pipe of try/with named clause, 1686`` () =
+    formatSourceString
+        false
+        """
+namespace Foo
+
+module Foo =
+    let a =
+        try
+            failwith ""
+        with
+        // hi!
+        | :? Exception as e ->
+            failwith ""
+"""
+        { config with
+              SpaceBeforeColon = true
+              SpaceBeforeSemicolon = true
+              IndentOnTryWith = true }
+    |> prepend newline
+    |> should
+        equal
+        """
+namespace Foo
+
+module Foo =
+    let a =
+        try
+            failwith ""
+        with
+            // hi!
+            :? Exception as e -> failwith ""
+"""
+
+[<Test>]
+let ``comment above pipe of try/with named clause, idempotent`` () =
+    formatSourceString
+        false
+        """
+namespace Foo
+
+module Foo =
+    let a =
+        try
+            failwith ""
+        with
+            // hi!
+            :? Exception as e -> failwith ""
+"""
+        { config with
+              SpaceBeforeColon = true
+              SpaceBeforeSemicolon = true
+              IndentOnTryWith = true }
+    |> prepend newline
+    |> should
+        equal
+        """
+namespace Foo
+
+module Foo =
+    let a =
+        try
+            failwith ""
+        with
+            // hi!
+            :? Exception as e -> failwith ""
+"""
+
 [<Test>]
 let ``respect IndentOnTryWith setting when there is trivia before SynMatchClause_Clause, 1647`` () =
     formatSourceString

src/Fantomas/CodePrinter.fs

@@ -2026,15 +2026,30 @@ and genExpr astContext synExpr ctx =
                 +> unindent
                 +> kw WITH !+~ "with"
 
-            let hasCommentBeforeClause (c: SynMatchClause) =
-                Map.tryFindOrEmptyList SynMatchClause_Clause ctx.TriviaMainNodes
-                |> List.exists
-                    (fun node ->
-                        RangeHelpers.rangeEq node.Range c.Range
-                        && TriviaHelpers.``has single line comment before`` node)
+            let hasCommentBeforeClause (c: SynMatchClause) (ctx: Context) : bool =
+                let barRange = ctx.MkRange e.Range.End c.Range.Start
+
+                let nodes =
+                    (Map.tryFindOrEmptyList SynMatchClause_Clause ctx.TriviaMainNodes
+                     |> List.choose
+                         (fun node ->
+                             if RangeHelpers.rangeEq node.Range c.Range then
+                                 Some node
+                             else
+                                 None))
+                    @ (Map.tryFindOrEmptyList BAR ctx.TriviaTokenNodes
+                       |> List.choose
+                           (fun node ->
+                               if RangeHelpers.``range contains`` barRange node.Range then
+                                   Some node
+                               else
+                                   None))
+
+                List.exists TriviaHelpers.``has single line comment before`` nodes
+
 
             let genClause (astContext: ASTContext) (b: bool) (c: SynMatchClause) =
-                ifElse
+                ifElseCtx
                     (hasCommentBeforeClause c)
                     (indentOnWith
                      +> genClause astContext b c