Remove unneeded readline interface methods

Author: rjmholt

src/PowerShellEditorServices/Services/PowerShell/Console/IReadLine.cs

@@ -12,9 +12,5 @@ internal interface IReadLine
         string ReadLine(CancellationToken cancellationToken);
 
         SecureString ReadSecureLine(CancellationToken cancellationToken);
-
-        bool TryOverrideReadKey(Func<bool, ConsoleKeyInfo> readKeyOverride);
-
-        bool TryOverrideIdleHandler(Action<CancellationToken> idleHandler);
     }
 }

src/PowerShellEditorServices/Services/PowerShell/Console/LegacyReadLine.cs

@@ -21,15 +21,19 @@ internal class LegacyReadLine : TerminalReadLine
 
         private readonly Task[] _readKeyTasks;
 
-        private Func<bool, ConsoleKeyInfo> _readKeyFunc;
+        private readonly Func<bool, ConsoleKeyInfo> _readKeyFunc;
 
-        private Action _onIdleAction;
+        private readonly Action<CancellationToken> _onIdleAction;
 
         public LegacyReadLine(
-            PsesInternalHost psesHost)
+            PsesInternalHost psesHost,
+            Func<bool, ConsoleKeyInfo> readKeyFunc,
+            Action<CancellationToken> onIdleAction)
         {
             _psesHost = psesHost;
             _readKeyTasks = new Task[2];
+            _readKeyFunc = readKeyFunc;
+            _onIdleAction = onIdleAction;
         }
 
         public override string ReadLine(CancellationToken cancellationToken)
@@ -376,18 +380,6 @@ public override string ReadLine(CancellationToken cancellationToken)
             return null;
         }
 
-        public override bool TryOverrideIdleHandler(Action<CancellationToken> idleHandler)
-        {
-            _onIdleAction = idleHandler;
-            return true;
-        }
-
-        public override bool TryOverrideReadKey(Func<bool, ConsoleKeyInfo> readKeyOverride)
-        {
-            _readKeyFunc = readKeyOverride;
-            return true;
-        }
-
         protected override ConsoleKeyInfo ReadKey(CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -421,7 +413,7 @@ private ConsoleKeyInfo ReadKeyWithIdleSupport(CancellationToken cancellationToke
 
                     // The idle timed out
                     case 1:
-                        _onIdleAction();
+                        _onIdleAction(cancellationToken);
                         _readKeyTasks[1] = Task.Delay(millisecondsDelay: 300, cancellationToken);
                         continue;
                 }

src/PowerShellEditorServices/Services/PowerShell/Console/PsrlReadLine.cs

@@ -23,11 +23,15 @@ internal class PsrlReadLine : TerminalReadLine
         public PsrlReadLine(
             PSReadLineProxy psrlProxy,
             PsesInternalHost psesHost,
-            EngineIntrinsics engineIntrinsics)
+            EngineIntrinsics engineIntrinsics,
+            Func<bool, ConsoleKeyInfo> readKeyFunc,
+            Action<CancellationToken> onIdleAction)
         {
             _psrlProxy = psrlProxy;
             _psesHost = psesHost;
             _engineIntrinsics = engineIntrinsics;
+            _psrlProxy.OverrideReadKey(readKeyFunc);
+            _psrlProxy.OverrideIdleHandler(onIdleAction);
         }
 
         #endregion
@@ -39,18 +43,6 @@ public override string ReadLine(CancellationToken cancellationToken)
             return _psesHost.InvokeDelegate<string>(representation: "ReadLine", new ExecutionOptions { MustRunInForeground = true }, InvokePSReadLine, cancellationToken);
         }
 
-        public override bool TryOverrideReadKey(Func<bool, ConsoleKeyInfo> readKeyFunc)
-        {
-            _psrlProxy.OverrideReadKey(readKeyFunc);
-            return true;
-        }
-
-        public override bool TryOverrideIdleHandler(Action<CancellationToken> idleHandler)
-        {
-            _psrlProxy.OverrideIdleHandler(idleHandler);
-            return true;
-        }
-
         protected override ConsoleKeyInfo ReadKey(CancellationToken cancellationToken)
         {
             return ConsoleProxy.ReadKey(intercept: true, cancellationToken);

src/PowerShellEditorServices/Services/PowerShell/Console/TerminalReadLine.cs

@@ -14,10 +14,6 @@ internal abstract class TerminalReadLine : IReadLine
     {
         public abstract string ReadLine(CancellationToken cancellationToken);
 
-        public abstract bool TryOverrideIdleHandler(Action<CancellationToken> idleHandler);
-
-        public abstract bool TryOverrideReadKey(Func<bool, ConsoleKeyInfo> readKeyOverride);
-
         protected abstract ConsoleKeyInfo ReadKey(CancellationToken cancellationToken);
 
         public SecureString ReadSecureLine(CancellationToken cancellationToken)

src/PowerShellEditorServices/Services/PowerShell/Host/PsesInternalHost.cs

@@ -630,11 +630,9 @@ private static PowerShell CreatePowerShellForRunspace(Runspace runspace)
                 // If we've been configured to use it, or if we can't load PSReadLine, use the legacy readline
                 if (hostStartupInfo.UsesLegacyReadLine || !TryLoadPSReadLine(pwsh, engineIntrinsics, out IReadLine readLine))
                 {
-                    readLine = new LegacyReadLine(this);
+                    readLine = new LegacyReadLine(this, ReadKey, OnPowerShellIdle);
                 }
 
-                readLine.TryOverrideReadKey(ReadKey);
-                readLine.TryOverrideIdleHandler(OnPowerShellIdle);
                 readLineProvider.OverrideReadLine(readLine);
                 System.Console.CancelKeyPress += OnCancelKeyPress;
                 System.Console.InputEncoding = Encoding.UTF8;
@@ -833,7 +831,7 @@ private bool TryLoadPSReadLine(PowerShell pwsh, EngineIntrinsics engineIntrinsic
             try
             {
                 var psrlProxy = PSReadLineProxy.LoadAndCreate(_loggerFactory, pwsh);
-                psrlReadLine = new PsrlReadLine(psrlProxy, this, engineIntrinsics);
+                psrlReadLine = new PsrlReadLine(psrlProxy, this, engineIntrinsics, ReadKey, OnPowerShellIdle);
                 return true;
             }
             catch (Exception e)