Keep newline if all items in list or array already had a newline, fixes

fsprojects#371.
nojaf · Nov 29, 2018 · 5d24b25 · 5d24b25
1 parent 0e9ed41
commit 5d24b25
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/src/Fantomas.Tests/PreserveEOLTests.fs b/src/Fantomas.Tests/PreserveEOLTests.fs
@@ -244,7 +244,7 @@ let y = [| 3;4
 let z = [7; 8]
     """ config
     |> should equal """
-let x = [ 1;
+let x = [ 1
           2 ]
 let y = [| 3; 4;
            5; 6 |]
@@ -551,4 +551,21 @@ sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam
 *)
 
-"""
+"""
+
+[<Test>]
+let ``preserve end of line should respect semicolon`` () =
+    formatSourceString false """
+let lst = 
+    [ 5
+      6
+      7
+    ]
+"""  config
+    |> should equal """
+let lst =
+    [ 5
+      6
+      7
+    ]
+"""
diff --git a/src/Fantomas/CodePrinter.fs b/src/Fantomas/CodePrinter.fs
@@ -502,10 +502,18 @@ and genExpr astContext synExpr =
     | StructTuple es -> !- "struct " +> sepOpenT +> genTuple astContext es +> sepCloseT
     | ArrayOrList(isArray, [], _) -> 
         ifElse isArray (sepOpenAFixed +> sepCloseAFixed) (sepOpenLFixed +> sepCloseLFixed)
-    | ArrayOrList(isArray, xs, isSimple) -> 
+    | ArrayOrList(isArray, xs, isSimple) ->
         let sep = ifElse isSimple sepSemi sepSemiNln
-        ifElse isArray (sepOpenA +> atCurrentColumn (colAutoNlnSkip0 sep xs (genExpr astContext)) +> sepCloseA) 
-            (sepOpenL +> atCurrentColumn (colAutoNlnSkip0 sep xs (genExpr astContext)) +> sepCloseL)
+        let sepWithPreserveEndOfLine ctx =
+            let length = List.length xs
+            let distinctLength = xs |> List.distinctBy (fun x -> x.Range.StartLine) |> List.length
+            let useNewline = ctx.Config.PreserveEndOfLine && (length = distinctLength)
+
+            ctx
+            |> ifElse useNewline sepNln sep
+
+        ifElse isArray (sepOpenA +> atCurrentColumn (colAutoNlnSkip0 sepWithPreserveEndOfLine xs (genExpr astContext)) +> sepCloseA) 
+            (sepOpenL +> atCurrentColumn (colAutoNlnSkip0 sepWithPreserveEndOfLine xs (genExpr astContext)) +> sepCloseL)
 
     | Record(inheritOpt, xs, eo) -> 
         sepOpenS