threadlocal console splitter

Author: majocha

tests/FSharp.Test.Utilities/CompilerAssert.fs

@@ -607,33 +607,20 @@ module rec CompilerAssertHelpers =
         compileCompilationAux outputDirectory (ResizeArray()) ignoreWarnings cmpl
 
     let captureConsoleOutputs (func: unit -> unit) =
-        let out = Console.Out
-        let err = Console.Error
-
-        let stdout = StringBuilder ()
-        let stderr = StringBuilder ()
-
-        use outWriter = new StringWriter (stdout)
-        use errWriter = new StringWriter (stderr)
+        Console.installWriters()
 
         let succeeded, exn =
             try
-                try
-                    Console.SetOut outWriter
-                    Console.SetError errWriter
-                    func ()
-                    true, None
-                with e ->
-                    let errorMessage = if e.InnerException <> null then e.InnerException.ToString() else e.ToString()
-                    stderr.Append errorMessage |> ignore
-                    false, Some e
-            finally
-                Console.SetOut out
-                Console.SetError err
-                outWriter.Close()
-                errWriter.Close()
-
-        succeeded, stdout.ToString(), stderr.ToString(), exn
+                func ()
+                true, None
+            with e ->
+                let errorMessage = if e.InnerException <> null then e.InnerException.ToString() else e.ToString()
+                Console.Error.Write errorMessage
+                false, Some e
+
+        let out, err = Console.getOutputs()
+
+        succeeded, out, err, exn
 
     let executeBuiltAppAndReturnResult (outputFilePath: string) (deps: string list) isFsx : (int * string * string) =
         let succeeded, stdout, stderr, _ = executeBuiltApp outputFilePath deps isFsx

tests/FSharp.Test.Utilities/Utilities.fs

@@ -38,6 +38,32 @@ type FactForDESKTOPAttribute() =
         do base.Skip <- "NETCOREAPP is not supported runtime for this kind of test, it is intended for DESKTOP only"
     #endif
 
+module Console =
+    type ThreadLocalTextWriter() =
+        inherit TextWriter()
+        static let threadLocalWriter = new ThreadLocal<TextWriter>(fun () -> new StringWriter() :> TextWriter )
+        override _.Encoding = threadLocalWriter.Value.Encoding
+        override _.Write(value: char) = threadLocalWriter.Value.Write(value)
+        override _.Write(value: string) = threadLocalWriter.Value.Write(value)
+        override _.WriteLine(value: string) = threadLocalWriter.Value.WriteLine(value)
+        member _.Reset() = threadLocalWriter.Value <- new StringWriter()
+        member _.Set writer = threadLocalWriter.Value <- writer
+        member _.GetText() = threadLocalWriter.Value.ToString()
+
+    let private out = new ThreadLocalTextWriter()
+    let private err = new ThreadLocalTextWriter()
+
+    let installWriters() =
+        out.Reset()
+        err.Reset()
+        Console.SetOut out
+        Console.SetError err
+
+    let getOutputs() = out.GetText(), err.GetText()
+
+    let setOut writer = out.Set writer
+
+    let setError writer = err.Set writer
 
 // This file mimics how Roslyn handles their compilation references for compilation testing
 module Utilities =
@@ -53,17 +79,6 @@ module Utilities =
         override _.Read() =
             if queue.Count > 0 then queue.Dequeue() |> int else -1
 
-    type RedirectConsoleInput() =
-        let oldStdIn = Console.In
-        let newStdIn = new CapturedTextReader()
-        do Console.SetIn(newStdIn)
-        member _.ProvideInput(text: string) =
-            newStdIn.ProvideInput(text)
-        interface IDisposable with
-            member _.Dispose() =
-                Console.SetIn(oldStdIn)
-                newStdIn.Dispose()
-
     type EventedTextWriter() =
         inherit TextWriter()
         let sb = StringBuilder()
@@ -90,8 +105,8 @@ module Utilities =
 
         do newStdOut.LineWritten.Add outputProduced.Trigger
         do newStdErr.LineWritten.Add errorProduced.Trigger
-        do Console.SetOut(newStdOut)
-        do Console.SetError(newStdErr)
+        do Console.setOut newStdOut
+        do Console.setError newStdErr
 
         member _.OutputProduced = outputProduced.Publish