Fix for additional newline. #289

src/Fantomas.Tests/CommentTests.fs

@@ -384,3 +384,51 @@ let x =
     // another comment 2
     printf "c"
 """ 
+
+[<Test>]
+let ``preserve newline should not add additional newline`` () =
+    let c = { config with PreserveEndOfLine = true }
+    let source = """
+type T() =
+    let x = 123
+//    override private x.ToString() = ""
+"""
+
+    formatSourceString false source c
+    |> should equal """
+type T() =
+    let x = 123
+//    override private x.ToString() = ""
+"""
+
+[<Test>]
+let ``preserve newline false should not add additional newline`` () =
+    let source = """
+type T() =
+    let x = 123
+//    override private x.ToString() = ""
+"""
+
+    formatSourceString false source config
+    |> prepend newline
+    |> should equal """
+type T() =
+    let x = 123
+//    override private x.ToString() = ""
+"""
+
+[<Test>]
+let ``preserve newline should not add additional newline II`` () =
+    let c = { config with PreserveEndOfLine = true }
+    let source = """
+let test n = [ n..-1..1 ]
+let y = ()
+// Some comments
+"""
+
+    formatSourceString false source c
+    |> should equal """
+let test n = [ n ..- 1..1 ]
+let y = ()
+// Some comments
+"""

src/Fantomas/CodeFormatter.fsx

@@ -17,7 +17,7 @@ open Fantomas
 
 CodeFormatter.Parse ("Program.fs", """let plus a b = a + b""")
 
-let config = FormatConfig.Default
+let config = { FormatConfig.Default with PreserveEndOfLine = true }
 
 let formatSrc (s : string) = 
     formatSourceString false (s.Replace("\r\n", "\n")) config |> printfn "%A";;
@@ -26,16 +26,10 @@ fsi.AddPrinter (fun (p : pos) -> p.ToString())
 fsi.AddPrinter (fun (r : range) -> r.ToString())
 
 """
-Log.Logger <- 
-  LoggerConfiguration() 
-   // Suave.SerilogExtensions has native destructuring mechanism
-   // this helps Serilog deserialize the fsharp types like unions/records
-   .Destructure.FSharpTypes()
-   // use package Serilog.Sinks.Console  
-   // https://github.com/serilog/serilog-sinks-console
-   .WriteTo.Console() 
-   // add more sinks etc.
-   .CreateLogger()"""
+type T() =
+    let x = 123
+//    override private x.ToString() = ""
+"""
 |> formatSrc
 
 // le nojaf

src/Fantomas/TokenMatcher.fs

@@ -738,6 +738,11 @@ let integrateComments isPreserveEOL compilationDefines (originalText : string) (
             loop origTokens moreNewTokens 
 
         // Process the last line or block comments
+        | (LineCommentChunk false (commentTokensText, moreOrigTokens)), [] when (isPreserveEOL) ->
+            Debug.WriteLine("injecting the last line comment '{0}'", String.concat "" commentTokensText |> box)
+            for x in commentTokensText do addText x
+            loop moreOrigTokens newTokens
+
         | (LineCommentChunk false (commentTokensText, moreOrigTokens)), []
         | (BlockCommentChunk (commentTokensText, moreOrigTokens)), [] ->
             Debug.WriteLine("injecting the last line or block comment '{0}'", String.concat "" commentTokensText |> box)