try a fix for linux line endings test fail

fsprojects · Nov 22, 2023 · 3db1fbf · 3db1fbf
1 parent 4884263
commit 3db1fbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/FSharp.Formatting.Literate/ParsePynb.fs b/src/FSharp.Formatting.Literate/ParsePynb.fs
@@ -3,6 +3,7 @@ namespace FSharp.Formatting.Literate
 open System.IO
 open System.Text.Json
 open FSharp.Formatting.Templating
+open FSharp.Formatting.PynbModel
 
 module internal ParsePynb =
 
@@ -17,7 +18,7 @@ module internal ParsePynb =
             match this with
             | Markdown source -> source
             | Code code ->
-                let codeBlock = sprintf $"```{code.lang}\n{code.source}\n```"
+                let codeBlock = sprintf $"```{code.lang}\n{addLineEnd code.source}```"
 
                 match code.outputs with
                 | None -> codeBlock
@@ -142,7 +143,7 @@ module internal ParsePynb =
 
         json.RootElement.GetProperty("cells").EnumerateArray()
         |> Seq.map (parseCell >> (fun x -> x.ToMarkdown()))
-        |> String.concat "\n\n"
+        |> String.concat "\n"
 
     let pynbToMarkdown ipynbFile =
         ipynbFile |> File.ReadAllText |> pynbStringToMarkdown

diff --git a/tests/FSharp.Literate.Tests/LiterateTests.fs b/tests/FSharp.Literate.Tests/LiterateTests.fs
@@ -1465,7 +1465,7 @@ let add a b = a + b
         |> Literate.ToPynb
         |> ParsePynb.pynbStringToMarkdown
 
-    mdOut |> shouldEqual mdIn
+    (mdOut.Trim()) |> shouldEqual (mdIn.Trim())
 
 [<Test>]
 let ``Script output is exactly right`` () =