Leading newline because of trivia does not item multiline. (#1710)

* Leading newline because of trivia does not item multiline. Fixes #1709. * Add release notes for 4.5.0-alpha-016.
fsprojects · May 9, 2021 · f10b822 · f10b822
1 parent 768402e
commit f10b822
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 6 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 4.5.0-alpha-016 - 05/2021
+
+* Fix Unexpected newline after inner let binding. [#1709](https://github.com/fsprojects/fantomas/issues/1709)
+
 ### 4.5.0-alpha-015 - 05/2021
 
 * Fix Currying a pair gets spread over multiple lines. [#1700](https://github.com/fsprojects/fantomas/issues/1700)

diff --git a/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj b/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <Version>4.5.0-alpha-015</Version>
+    <Version>4.5.0-alpha-016</Version>
     <NoWarn>FS0988</NoWarn>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>

diff --git a/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj b/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj
@@ -5,7 +5,7 @@
     <RollForward>Major</RollForward>
     <ToolCommandName>fantomas</ToolCommandName>
     <PackAsTool>True</PackAsTool>
-    <Version>4.5.0-alpha-015</Version>
+    <Version>4.5.0-alpha-016</Version>
     <AssemblyName>fantomas-tool</AssemblyName>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>

diff --git a/src/Fantomas.Extras/Fantomas.Extras.fsproj b/src/Fantomas.Extras/Fantomas.Extras.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>4.5.0-alpha-015</Version>
+    <Version>4.5.0-alpha-016</Version>
     <Description>Utility package for Fantomas</Description>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>

diff --git a/src/Fantomas.Tests/ColMultilineItemTests.fs b/src/Fantomas.Tests/ColMultilineItemTests.fs
@@ -406,3 +406,38 @@ let blah<'a> config : Type =
     let result = Runner.Run<'a> config
     ()
 """
+
+[<Test>]
+let ``leading newline because of trivia does not item multiline, 1709`` () =
+    formatSourceString
+        false
+        """
+[<Fact>]
+let ``first lamba`` () =
+    // You can use the `fun` keyword to write lambda's.
+    // Mind the -> instead of C#'s =>
+    // TODO: complete the lambda so that the value is returned in uppercase.
+    let toUpperCase = fun a -> a
+    // ref: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/functions/lambda-expressions-the-fun-keyword
+
+    let name = "Joey"
+    let uppercased = toUpperCase name
+    Assert.Equal("JOEY", uppercased)
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+[<Fact>]
+let ``first lamba`` () =
+    // You can use the `fun` keyword to write lambda's.
+    // Mind the -> instead of C#'s =>
+    // TODO: complete the lambda so that the value is returned in uppercase.
+    let toUpperCase = fun a -> a
+    // ref: https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/functions/lambda-expressions-the-fun-keyword
+
+    let name = "Joey"
+    let uppercased = toUpperCase name
+    Assert.Equal("JOEY", uppercased)
+"""
diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>4.5.0-alpha-015</Version>
+    <Version>4.5.0-alpha-016</Version>
     <NoWarn>FS0988</NoWarn>
     <TargetFramework>net5.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>

diff --git a/src/Fantomas/Context.fs b/src/Fantomas/Context.fs
@@ -1448,7 +1448,8 @@ let private isMultilineItem (expr: Context -> Context) (ctx: Context) : bool * C
                     // filter leading newlines and trivia
                     match Array.head events with
                     | CommentOrDefineEvent _
-                    | WriteLine -> true
+                    | WriteLine
+                    | WriteLineBecauseOfTrivia -> true
                     | _ -> false
                 else
                     false)

diff --git a/src/Fantomas/Fantomas.fsproj b/src/Fantomas/Fantomas.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>4.5.0-alpha-015</Version>
+    <Version>4.5.0-alpha-016</Version>
     <Description>Source code formatter for F#</Description>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>