From ab87225f1f647b56228751a5532695e839555982 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Fri, 22 Apr 2022 22:33:55 +0300
Subject: [PATCH] Cleanup

---
 CliFx/Infrastructure/ConsoleReader.cs |  6 ++--
 CliFx/Infrastructure/ConsoleWriter.cs |  6 ++--
 CliFx/Infrastructure/FakeConsole.cs   | 46 +++++++++++++--------------
 CliFx/Infrastructure/IConsole.cs      | 20 ++++++------
 CliFx/Infrastructure/SystemConsole.cs | 38 +++++++++++-----------
 5 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/CliFx/Infrastructure/ConsoleReader.cs b/CliFx/Infrastructure/ConsoleReader.cs
index 88112cb..4f30dde 100644
--- a/CliFx/Infrastructure/ConsoleReader.cs
+++ b/CliFx/Infrastructure/ConsoleReader.cs
@@ -99,10 +99,8 @@ public partial class ConsoleReader : StreamReader
 
 public partial class ConsoleReader
 {
-    internal static ConsoleReader Create(IConsole console, Stream? stream) => new(
+    internal static ConsoleReader Create(IConsole console, Stream stream) => new(
         console,
-        stream is not null
-            ? Stream.Synchronized(stream)
-            : Stream.Null
+        Stream.Synchronized(stream)
     );
 }
\ No newline at end of file
diff --git a/CliFx/Infrastructure/ConsoleWriter.cs b/CliFx/Infrastructure/ConsoleWriter.cs
index 1873ea7..86f074f 100644
--- a/CliFx/Infrastructure/ConsoleWriter.cs
+++ b/CliFx/Infrastructure/ConsoleWriter.cs
@@ -272,10 +272,8 @@ public partial class ConsoleWriter : StreamWriter
 
 public partial class ConsoleWriter
 {
-    internal static ConsoleWriter Create(IConsole console, Stream? stream) => new(
+    internal static ConsoleWriter Create(IConsole console, Stream stream) => new(
         console,
-        stream is not null
-            ? Stream.Synchronized(stream)
-            : Stream.Null
+        Stream.Synchronized(stream)
     ) {AutoFlush = true};
 }
\ No newline at end of file
diff --git a/CliFx/Infrastructure/FakeConsole.cs b/CliFx/Infrastructure/FakeConsole.cs
index 7e9a6aa..600e6c6 100644
--- a/CliFx/Infrastructure/FakeConsole.cs
+++ b/CliFx/Infrastructure/FakeConsole.cs
@@ -59,14 +59,33 @@ public class FakeConsole : IConsole, IDisposable
     /// </summary>
     public FakeConsole(Stream? input = null, Stream? output = null, Stream? error = null)
     {
-        Input = ConsoleReader.Create(this, input);
-        Output = ConsoleWriter.Create(this, output);
-        Error = ConsoleWriter.Create(this, error);
+        Input = ConsoleReader.Create(this, input ?? Stream.Null);
+        Output = ConsoleWriter.Create(this, output ?? Stream.Null);
+        Error = ConsoleWriter.Create(this, error ?? Stream.Null);
+    }
+
+    /// <inheritdoc />
+    public ConsoleKeyInfo ReadKey(bool intercept = false) =>
+        _keys.TryDequeue(out var key)
+            ? key
+            : throw new InvalidOperationException(
+                "Cannot read key because there are no key presses enqueued. " +
+                $"Use the `{nameof(EnqueueKey)}(...)` method to simulate a key press."
+            );
+
+    /// <summary>
+    /// Enqueues a simulated key press, which can then be read by calling <see cref="ReadKey"/>.
+    /// </summary>
+    public void EnqueueKey(ConsoleKeyInfo key) => _keys.Enqueue(key);
+    
+    /// <inheritdoc />
+    public void Clear()
+    {
     }
 
     /// <inheritdoc />
     public CancellationToken RegisterCancellationHandler() => _cancellationTokenSource.Token;
-
+    
     /// <summary>
     /// Sends a cancellation signal to the currently executing command.
     /// </summary>
@@ -87,25 +106,6 @@ public class FakeConsole : IConsole, IDisposable
         }
     }
 
-    /// <inheritdoc />
-    public void Clear()
-    {
-    }
-
-    /// <inheritdoc />
-    public ConsoleKeyInfo ReadKey(bool intercept = false) =>
-        _keys.TryDequeue(out var key)
-            ? key
-            : throw new InvalidOperationException(
-                "Cannot read key because there are no key presses enqueued. " +
-                $"Use the `{nameof(EnqueueKey)}(...)` method to simulate a key press."
-            );
-
-    /// <summary>
-    /// Enqueues a simulated key press, which can then be read by calling <see cref="ReadKey"/>.
-    /// </summary>
-    public void EnqueueKey(ConsoleKeyInfo key) => _keys.Enqueue(key);
-
     /// <inheritdoc />
     public virtual void Dispose() => _cancellationTokenSource.Dispose();
 }
\ No newline at end of file
diff --git a/CliFx/Infrastructure/IConsole.cs b/CliFx/Infrastructure/IConsole.cs
index 694af6e..c674fe6 100644
--- a/CliFx/Infrastructure/IConsole.cs
+++ b/CliFx/Infrastructure/IConsole.cs
@@ -64,6 +64,16 @@ public interface IConsole
     /// </summary>
     int CursorTop { get; set; }
 
+    /// <summary>
+    /// Obtains the next character or function key pressed by the user.
+    /// </summary>
+    ConsoleKeyInfo ReadKey(bool intercept = false);
+    
+    /// <summary>
+    /// Clears the console buffer and corresponding console window of display information.
+    /// </summary>
+    void Clear();
+    
     /// <summary>
     /// Registers a handler for the interrupt signal (Ctrl+C) on the console and returns
     /// a token representing the cancellation request.
@@ -82,16 +92,6 @@ public interface IConsole
     /// </para>
     /// </remarks>
     CancellationToken RegisterCancellationHandler();
-
-    /// <summary>
-    /// Clears the console buffer and corresponding console window of display information.
-    /// </summary>
-    void Clear();
-
-    /// <summary>
-    /// Obtains the next character or function key pressed by the user.
-    /// </summary>
-    ConsoleKeyInfo ReadKey(bool intercept = false);
 }
 
 /// <summary>
diff --git a/CliFx/Infrastructure/SystemConsole.cs b/CliFx/Infrastructure/SystemConsole.cs
index 385d20a..b9444e7 100644
--- a/CliFx/Infrastructure/SystemConsole.cs
+++ b/CliFx/Infrastructure/SystemConsole.cs
@@ -41,6 +41,20 @@ public class SystemConsole : IConsole, IDisposable
         get => Console.BackgroundColor;
         set => Console.BackgroundColor = value;
     }
+    
+    /// <inheritdoc />
+    public int CursorLeft
+    {
+        get => Console.CursorLeft;
+        set => Console.CursorLeft = value;
+    }
+
+    /// <inheritdoc />
+    public int CursorTop
+    {
+        get => Console.CursorTop;
+        set => Console.CursorTop = value;
+    }
 
     /// <summary>
     /// Initializes an instance of <see cref="SystemConsole"/>.
@@ -56,19 +70,11 @@ public class SystemConsole : IConsole, IDisposable
     public void ResetColor() => Console.ResetColor();
 
     /// <inheritdoc />
-    public int CursorLeft
-    {
-        get => Console.CursorLeft;
-        set => Console.CursorLeft = value;
-    }
-
+    public ConsoleKeyInfo ReadKey(bool intercept = false) => Console.ReadKey(intercept);
+    
     /// <inheritdoc />
-    public int CursorTop
-    {
-        get => Console.CursorTop;
-        set => Console.CursorTop = value;
-    }
-
+    public void Clear() => Console.Clear();
+    
     /// <inheritdoc />
     public CancellationToken RegisterCancellationHandler()
     {
@@ -89,13 +95,7 @@ public class SystemConsole : IConsole, IDisposable
 
         return (_cancellationTokenSource = cts).Token;
     }
-
-    /// <inheritdoc />
-    public void Clear() => Console.Clear();
-
-    /// <inheritdoc />
-    public ConsoleKeyInfo ReadKey(bool intercept = false) => Console.ReadKey(intercept);
-
+    
     /// <inheritdoc />
     public void Dispose()
     {