Change property back to field

jamestiotio · Apr 5, 2022 · 2845063 · 2845063
1 parent 910e6a0
commit 2845063
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/Src/Microsoft.Scripting/Runtime/SharedIO.cs b/Src/Microsoft.Scripting/Runtime/SharedIO.cs
@@ -97,13 +97,13 @@ private void InitializeInput() {
                             _inputEncoding = Console.InputEncoding;
                             _inputReader = Console.In;
 #elif FEATURE_BASIC_CONSOLE
-                        _inputEncoding = Encoding.Default;
-                        _inputStream = new TextStream(Console.In, _inputEncoding);
-                        _inputReader = Console.In;
+                            _inputEncoding = Encoding.Default;
+                            _inputStream = new TextStream(Console.In, _inputEncoding);
+                            _inputReader = Console.In;
 #else
-                        _inputEncoding = Encoding.UTF8;
-                        _inputStream = Stream.Null;
-                        _inputReader = TextReader.Null;
+                            _inputEncoding = Encoding.UTF8;
+                            _inputStream = Stream.Null;
+                            _inputReader = TextReader.Null;
 #endif
                         } catch (PlatformNotSupportedException) {
                             // When on BlazorWebassembly, this exception is thrown.

diff --git a/Src/Microsoft.Scripting/Utils/ConsoleInputStream.cs b/Src/Microsoft.Scripting/Utils/ConsoleInputStream.cs
@@ -16,16 +16,7 @@ namespace Microsoft.Scripting.Utils {
     /// This class wraps the standard input stream with a buffer that ensures that enough data are read from the underlying stream.
     /// </summary>
     public sealed class ConsoleInputStream : Stream {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        private static ConsoleInputStream _instance = null;
-
-        public static ConsoleInputStream Instance {
-            // When there is no input stream available (e.g. BlazorWasm), propagate PlatformNotSupportedException
-            get {
-                if (_instance == null) _instance = new();
-                return _instance;
-            }
-        }
+        public static readonly ConsoleInputStream Instance = new ConsoleInputStream();
 
         // we use 0x1000 to be safe (MSVCRT uses this value for stdin stream buffer).
         private const int MinimalBufferSize = 0x1000; 
@@ -35,9 +26,13 @@ public static ConsoleInputStream Instance {
         private readonly byte[] _buffer = new byte[MinimalBufferSize];
         private int _bufferPos;
         private int _bufferSize;
-        
+
         private ConsoleInputStream() {
-            _input = Console.OpenStandardInput();
+            try {
+                _input = Console.OpenStandardInput();
+            } catch (PlatformNotSupportedException) {
+                _input = Stream.Null;
+            }
         }
 
         public override bool CanRead {