Print leading newlines when formatting a selection.

fsprojects · Jun 11, 2022 · 748e658 · 748e658
1 parent 2e6a107
commit 748e658
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/Fantomas.Core.Tests/ContextTests.fs b/src/Fantomas.Core.Tests/ContextTests.fs
@@ -7,6 +7,8 @@ open Fantomas.Core.Tests.TestHelper
 open Fantomas.Core.FormatConfig
 open Fantomas.Core
 
+let private dump = dump false
+
 [<Test>]
 let ``sepSpace should not add an additional space if the line ends with a space`` () =
     let expr = !- "let a = " +> sepSpace

diff --git a/src/Fantomas.Core.Tests/FormattingSelectionOnlyTests.fs b/src/Fantomas.Core.Tests/FormattingSelectionOnlyTests.fs
@@ -74,6 +74,7 @@ let x =
     |> should
         equal
         "
+
 try
     something ()
 with ex ->
@@ -125,8 +126,7 @@ let a =  9
         equal
         """
 
-let a = 9
-"""
+let a = 9"""
 
 // 10	25	10	82
 //[<Test>]

diff --git a/src/Fantomas.Core/CodeFormatterImpl.fs b/src/Fantomas.Core/CodeFormatterImpl.fs
@@ -65,7 +65,7 @@ let formatWith
 
         context
         |> genParsedInput ASTContext.Default ast
-        |> Context.dump
+        |> Context.dump (Option.isSome selection)
 
     formattedSourceCode
 

diff --git a/src/Fantomas.Core/Context.fs b/src/Fantomas.Core/Context.fs
@@ -295,7 +295,7 @@ let finalizeWriterModel (ctx: Context) =
     else
         ctx
 
-let dump (ctx: Context) =
+let dump (isSelection: bool) (ctx: Context) =
     let ctx = finalizeWriterModel ctx
 
     match ctx.WriterModel.Lines with
@@ -304,7 +304,12 @@ let dump (ctx: Context) =
         // Always trim the last line
         h.TrimEnd() :: tail
     |> List.rev
-    |> List.skipWhile ((=) "")
+    |> fun lines ->
+        // Don't skip leading newlines when formatting a selection.
+        if isSelection then
+            lines
+        else
+            List.skipWhile ((=) "") lines
     |> String.concat ctx.Config.EndOfLine.NewLineString
 
 let dumpAndContinue (ctx: Context) =