Fix 360

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 2.9.2 - XX-2018
+* Fix preserveEndOfLine introduces additional newlines. [#360](https://github.com/fsprojects/fantomas/issues/360) 
+
 #### 2.9.1 - 11-2018
 * Added instructions for vscode and online website. [#333](https://github.com/fsprojects/fantomas/pull/333)
 * Removed trailing spaces for each line, after formatting. [#328](https://github.com/fsprojects/fantomas/issues/328)
@@ -11,8 +14,6 @@
 * Added regression test for Implicit module is added to resulting code. [#355](https://github.com/fsprojects/fantomas/pull/355)
 * Fix wrong comment placement. [#289](https://github.com/fsprojects/fantomas/issues/289)
 
-
-
 #### 2.9.0 - 10-2018
 * Improved README. [#243](https://github.com/fsprojects/fantomas/issues/243)
 * Bad split of chained method call expression. [#246](https://github.com/fsprojects/fantomas/issues/246)

src/Fantomas.Cmd/AssemblyInfo.fs

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Fantomas")>]
 [<assembly: AssemblyProductAttribute("Fantomas")>]
 [<assembly: AssemblyDescriptionAttribute("Source code formatter for F#")>]
-[<assembly: AssemblyVersionAttribute("2.9.1")>]
-[<assembly: AssemblyFileVersionAttribute("2.9.1")>]
+[<assembly: AssemblyVersionAttribute("2.9.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Fantomas"
     let [<Literal>] AssemblyProduct = "Fantomas"
     let [<Literal>] AssemblyDescription = "Source code formatter for F#"
-    let [<Literal>] AssemblyVersion = "2.9.1"
-    let [<Literal>] AssemblyFileVersion = "2.9.1"
+    let [<Literal>] AssemblyVersion = "2.9.2"
+    let [<Literal>] AssemblyFileVersion = "2.9.2"

src/Fantomas.Cmd/Fantomas.Cmd.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <Version>2.9.1</Version>
+    <Version>2.9.2</Version>
     <AssemblyName>dotnet-fantomas</AssemblyName>
     <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>

src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj

@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <ToolCommandName>fantomas</ToolCommandName>
     <PackAsTool>True</PackAsTool>
-    <Version>2.9.1</Version>
+    <Version>2.9.2</Version>
     <AssemblyName>fantomas-tool</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

src/Fantomas.Tests/Fantomas.Tests.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.9.1</Version>
+    <Version>2.9.2</Version>
     <NoWarn>FS0988</NoWarn>
     <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>

src/Fantomas.Tests/PreserveEOLTests.fs

@@ -469,3 +469,24 @@ let x = 1
 let y = 2
 #endif
 """
+
+[<Test>]
+let ``single line comments at end of line should not added additional newline`` () =
+    let config = { config with PageWidth = 80 }
+
+    formatSourceString false """
+type QueryOption =
+    | FixedQuery of string // xpath
+    | KeywordSearch of string // keyword
+
+type MessageTypeQueryMeta =
+    { Options: QueryOption list }
+"""  config
+    |> should equal """
+type QueryOption =
+    | FixedQuery of string // xpath
+    | KeywordSearch of string // keyword
+
+type MessageTypeQueryMeta =
+    { Options : QueryOption list }
+"""

src/Fantomas/AssemblyInfo.fs

@@ -7,14 +7,14 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("FantomasLib")>]
 [<assembly: AssemblyProductAttribute("Fantomas")>]
 [<assembly: AssemblyDescriptionAttribute("Source code formatter for F#")>]
-[<assembly: AssemblyVersionAttribute("2.9.1")>]
-[<assembly: AssemblyFileVersionAttribute("2.9.1")>]
+[<assembly: AssemblyVersionAttribute("2.9.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.2")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] InternalsVisibleTo = "Fantomas.Tests"
     let [<Literal>] AssemblyTitle = "FantomasLib"
     let [<Literal>] AssemblyProduct = "Fantomas"
     let [<Literal>] AssemblyDescription = "Source code formatter for F#"
-    let [<Literal>] AssemblyVersion = "2.9.1"
-    let [<Literal>] AssemblyFileVersion = "2.9.1"
+    let [<Literal>] AssemblyVersion = "2.9.2"
+    let [<Literal>] AssemblyFileVersion = "2.9.2"

src/Fantomas/CodeFormatter.fsx

@@ -26,9 +26,13 @@ fsi.AddPrinter (fun (p : pos) -> p.ToString())
 fsi.AddPrinter (fun (r : range) -> r.ToString())
 
 """
-type T() =
-    let x = 123
-//    override private x.ToString() = ""
+type QueryOption =
+    | FixedQuery of string // xpath
+    | KeywordSearch of string // keyword
+
+type MessageTypeQueryMeta =
+    { Options: QueryOption list }
+
 """
 |> formatSrc
 

src/Fantomas/Fantomas.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
-    <Version>2.9.1</Version>
+    <Version>2.9.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Include="paket.references" />

src/Fantomas/TokenMatcher.fs

@@ -665,8 +665,9 @@ let integrateComments isPreserveEOL compilationDefines (originalText : string) (
             | Space _ :: (EOL, newTokText) :: moreNewTokens | (EOL, newTokText) :: moreNewTokens ->
                 addText " "
                 for x in commentTokensText do addText x
-                Debug.WriteLine "emitting newline for end of sticky-to-left comment" 
-                addText newTokText 
+                if not isPreserveEOL then
+                    Debug.WriteLine "emitting newline for end of sticky-to-left comment" 
+                    addText newTokText
                 loop moreOrigTokens moreNewTokens 
             // Otherwise, skip a whitespace token and maintain the indentation
             | Space _ :: moreNewTokens | moreNewTokens ->