Address PR feedback

dotnet · Apr 22, 2024 · f6da33f · f6da33f
1 parent b87524b
commit f6da33f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/src/libraries/System.Console/src/System/Console.cs b/src/libraries/System.Console/src/System/Console.cs
@@ -235,23 +235,16 @@ static TextWriter EnsureInitialized()
 
         private static TextWriter CreateOutputWriter(Stream outputStream)
         {
-            if (outputStream == Stream.Null)
-                return TextWriter.Null;
-
-            StreamWriter writer = new StreamWriter(
-                stream: outputStream,
-                encoding: OutputEncoding.RemovePreamble(), // This ensures no prefix is written to the stream.
-                bufferSize: WriteBufferSize,
-                leaveOpen: true
-            ) {
-                AutoFlush = true
-            };
-
-#if TARGET_BROWSER && !FEATURE_WASM_MANAGED_THREADS
-            return writer;
-#else
-            return TextWriter.Synchronized(writer);
-#endif
+            return outputStream == Stream.Null ?
+                TextWriter.Null :
+                TextWriter.Synchronized(new StreamWriter(
+                    stream: outputStream,
+                    encoding: OutputEncoding.RemovePreamble(), // This ensures no prefix is written to the stream.
+                    bufferSize: WriteBufferSize,
+                    leaveOpen: true)
+                    {
+                        AutoFlush = true
+                    });
         }
 
         private static StrongBox<bool>? _isStdInRedirected;
@@ -709,10 +702,7 @@ public static void SetOut(TextWriter newOut)
             // are nops.
             if (newOut != TextWriter.Null)
             {
-#if TARGET_BROWSER && !FEATURE_WASM_MANAGED_THREADS
-#else
                 newOut = TextWriter.Synchronized(newOut);
-#endif
             }
 
             lock (s_syncObject)
@@ -729,10 +719,7 @@ public static void SetError(TextWriter newError)
             // Ensure all access to the writer is synchronized. See comment in SetOut.
             if (newError != TextWriter.Null)
             {
-#if TARGET_BROWSER && !FEATURE_WASM_MANAGED_THREADS
-#else
                 newError = TextWriter.Synchronized(newError);
-#endif
             }
 
             lock (s_syncObject)

diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/TextWriter.cs b/src/libraries/System.Private.CoreLib/src/System/IO/TextWriter.cs
@@ -737,7 +737,11 @@ public static TextWriter Synchronized(TextWriter writer)
         {
             ArgumentNullException.ThrowIfNull(writer);
 
+#if !TARGET_BROWSER || FEATURE_WASM_MANAGED_THREADS
             return writer is SyncTextWriter ? writer : new SyncTextWriter(writer);
+#else
+            return writer;
+#endif
         }
 
         internal sealed class SyncTextWriter : TextWriter, IDisposable