Fixes #211 and created release notes for solved issues after 2.7.1

RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+#### 2.7.2 - xx-05-2018
+* Wrong indentation of `else` after comment [#241](https://github.com/dungpa/fantomas/issues/241)
+* Change Content to None [#238](https://github.com/dungpa/fantomas/issues/238)
+* Formatting of code with a pipe and a lambda expression [#211](https://github.com/dungpa/fantomas/issues/211)
+
 #### 2.7.1 - 03-05-2018
 * Hotfix for runtime problem when using dotnet cli tool
 

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.7.1")>]
-[<assembly: AssemblyFileVersionAttribute("2.7.1")>]
+[<assembly: AssemblyVersionAttribute("2.7.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.7.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.7.1"
-    let [<Literal>] AssemblyFileVersion = "2.7.1"
+    let [<Literal>] AssemblyVersion = "2.7.2"
+    let [<Literal>] AssemblyFileVersion = "2.7.2"

src/Fantomas.Cmd/Fantomas.Cmd.fsproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
-    <Version>2.7.1</Version>
+    <Version>2.7.2</Version>
     <AssemblyName>dotnet-fantomas</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

src/Fantomas.Tests/Fantomas.Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
-    <Version>2.7.1</Version>
+    <Version>2.7.2</Version>
     <NoWarn>FS0988</NoWarn>
   </PropertyGroup>
   <ItemGroup>

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.7.1")>]
-[<assembly: AssemblyFileVersionAttribute("2.7.1")>]
+[<assembly: AssemblyVersionAttribute("2.7.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.7.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.7.1"
-    let [<Literal>] AssemblyFileVersion = "2.7.1"
+    let [<Literal>] AssemblyVersion = "2.7.2"
+    let [<Literal>] AssemblyFileVersion = "2.7.2"

src/Fantomas/Fantomas.fsproj

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

src/Fantomas/SourceTransformer.fs

@@ -88,14 +88,17 @@ let rec multiline synExpr =
     // Default mode is single-line
     | _ -> false
 
-let checkNewLine e es = 
+let checkNewLine e es =
     match (e, es) with
-    | (Microsoft.FSharp.Compiler.Ast.SynExpr.Match(_,_,_,_,_), (s, e1) :: _)  -> 
-        true
-    | (_, (s, e1) :: _) ->
-        let containsInfix = NewLineInfixOps.Contains s
-        let isMultiline = multiline e1
-        containsInfix
+    | _, [s, infixExpr] when NewLineInfixOps.Contains s -> 
+        (*
+            If s is a single infix (f.e. |> )
+            Only multiline if the whole expression is multiline
+            or the next expression is multiline
+            See test ``pipe and multiline should put pipe on newline``
+        *)
+        multiline e || multiline infixExpr
+    | _, (s, _) :: _ :: _ -> NewLineInfixOps.Contains s
     | _ -> multiline e
 
 /// Check if the expression already has surrounding parentheses