Add SynExpr_Upcast and SynExpr_Downcast to genTrivia of genExpr. Fixes …

…#1227. (#1229)
fsprojects · Nov 7, 2020 · de55bd9 · de55bd9
1 parent a79600b
commit de55bd9
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 0 deletions.
diff --git a/src/Fantomas.Tests/CastTests.fs b/src/Fantomas.Tests/CastTests.fs
@@ -51,3 +51,70 @@ longMethodName
     longArgument2
 :> List<bool>
 """
+
+[<Test>]
+let ``trivia newline before upcast, 1227`` () =
+    formatSourceString false """
+module S3v2
+
+open System.Threading.Tasks
+open Amazon.Runtime
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+    x.Result :> AmazonWebServiceResponse
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+
+    x.Result :> AmazonWebServiceResponse
+"""  config
+    |> prepend newline
+    |> should equal """
+module S3v2
+
+open System.Threading.Tasks
+open Amazon.Runtime
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+
+    x.Result :> AmazonWebServiceResponse
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+
+    x.Result :> AmazonWebServiceResponse
+"""
+
+[<Test>]
+let ``trivia newline before downcast`` () =
+    formatSourceString false """
+module S3v2
+
+open System.Threading.Tasks
+open Amazon.Runtime
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+
+    x.Result :?> AmazonWebServiceResponse
+"""  config
+    |> prepend newline
+    |> should equal """
+module S3v2
+
+open System.Threading.Tasks
+open Amazon.Runtime
+
+let waitAndUpcast (x: Task<'t>) =
+    let t =
+        x |> Async.AwaitTask |> Async.RunSynchronously
+
+    x.Result :?> AmazonWebServiceResponse
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -2721,6 +2721,8 @@ and genExpr astContext synExpr ctx =
             | SynExpr.MatchLambda _ -> genTriviaFor SynExpr_MatchLambda synExpr.Range
             | SynExpr.LongIdent _ -> genTriviaFor SynExpr_LongIdent synExpr.Range
             | SynExpr.DotGet _ -> genTriviaFor SynExpr_DotGet synExpr.Range
+            | SynExpr.Upcast _ -> genTriviaFor SynExpr_Upcast synExpr.Range
+            | SynExpr.Downcast _ -> genTriviaFor SynExpr_Downcast synExpr.Range
             | _ -> id)
 
     expr ctx