Get rid of StoppedExpecting event and made methods internal again in favor of Abandoned instead

Terminal.Gui/ConsoleDrivers/AnsiResponseParser/AnsiResponseParser.cs

@@ -26,9 +26,6 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
 
     private AnsiResponseParserState _state = AnsiResponseParserState.Normal;
 
-    /// <inheritdoc />
-    public event EventHandler<EventArgs<string>>? StoppedExpecting;
-
     /// <inheritdoc />
     public AnsiResponseParserState State
     {
@@ -309,8 +306,6 @@ internal abstract class AnsiResponseParserBase : IAnsiResponseParser
     /// <inheritdoc/>
     public void StopExpecting (string terminator, bool persistent)
     {
-        StoppedExpecting?.Invoke (this, new (terminator));
-
         lock (lockExpectedResponses)
         {
             if (persistent)

Terminal.Gui/ConsoleDrivers/AnsiResponseParser/IAnsiResponseParser.cs

@@ -7,11 +7,6 @@ namespace Terminal.Gui;
 /// </summary>
 public interface IAnsiResponseParser
 {
-    /// <summary>
-    /// Called when parser is told to <see cref="StopExpecting"/> a response for a given request
-    /// </summary>
-    public event EventHandler<EventArgs<string>> StoppedExpecting;
-
     /// <summary>
     ///     Current state of the parser based on what sequence of characters it has
     ///     read from the console input stream.

Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs

@@ -627,7 +627,7 @@ public abstract class ConsoleDriver
         GetRequestScheduler ().SendOrSchedule (request);
     }
 
-    public abstract IAnsiResponseParser GetParser ();
+    internal abstract IAnsiResponseParser GetParser ();
 
     internal AnsiRequestScheduler GetRequestScheduler ()
     {

Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs

@@ -592,7 +592,7 @@ internal class CursesDriver : ConsoleDriver
 
     private readonly AnsiResponseParser _parser = new ();
     /// <inheritdoc />
-    public override IAnsiResponseParser GetParser () => _parser;
+    internal override IAnsiResponseParser GetParser () => _parser;
 
     internal void ProcessInput ()
     {

Terminal.Gui/ConsoleDrivers/FakeDriver/FakeDriver.cs

@@ -395,7 +395,7 @@ public class FakeDriver : ConsoleDriver
     private AnsiResponseParser _parser = new ();
 
     /// <inheritdoc />
-    public override IAnsiResponseParser GetParser () => _parser;
+    internal override IAnsiResponseParser GetParser () => _parser;
 
     /// <inheritdoc />
     internal override void RawWrite (string str) { }

Terminal.Gui/ConsoleDrivers/NetDriver.cs

@@ -994,7 +994,7 @@ internal class NetDriver : ConsoleDriver
     }
 
     /// <inheritdoc />
-    public override IAnsiResponseParser GetParser () => _mainLoopDriver._netEvents.Parser;
+    internal override IAnsiResponseParser GetParser () => _mainLoopDriver._netEvents.Parser;
 
     /// <inheritdoc />
     internal override void RawWrite (string str)

Terminal.Gui/ConsoleDrivers/WindowsDriver.cs

@@ -1180,7 +1180,7 @@ internal class WindowsDriver : ConsoleDriver
     }
 
     /// <inheritdoc />
-    public override IAnsiResponseParser GetParser () => _parser;
+    internal override IAnsiResponseParser GetParser () => _parser;
 
     /// <inheritdoc />
     internal override void RawWrite (string str) => WinConsole?.WriteANSI (str);

UICatalog/Scenarios/AnsiRequestsScenario.cs

@@ -155,8 +155,6 @@ public sealed class AnsiEscapeSequenceRequests : Scenario
         var lblSuccess = new Label { X = Pos.Center (), Y = Pos.Bottom (btnResponse) + 1 };
         w.Add (lblSuccess);
 
-        Application.Driver.GetParser ().StoppedExpecting += (s,e)=>OnFail(e.CurrentValue,tvResponse,tvError,tvValue,tvTerminator, lblSuccess);
-
         btnResponse.Accepting += (s, e) =>
                                  {
                                      var ansiEscapeSequenceRequest = new AnsiEscapeSequenceRequest
@@ -171,7 +169,8 @@ public sealed class AnsiEscapeSequenceRequests : Scenario
                                                                           {
                                                                               Request = ansiEscapeSequenceRequest.Request,
                                                                               Terminator = ansiEscapeSequenceRequest.Terminator,
-                                                                              ResponseReceived = (s)=>OnSuccess(s, tvResponse, tvError, tvValue, tvTerminator,lblSuccess)
+                                                                              ResponseReceived = (s)=>OnSuccess(s, tvResponse, tvError, tvValue, tvTerminator,lblSuccess),
+                                                                              Abandoned =()=> OnFail (tvResponse, tvError, tvValue, tvTerminator, lblSuccess)
                                                                           });
                                  };
 
@@ -193,12 +192,12 @@ public sealed class AnsiEscapeSequenceRequests : Scenario
             lblSuccess.Text = "Successful";
     }
 
-    private void OnFail (string terminator, TextView tvResponse, TextView tvError, TextView tvValue, TextView tvTerminator, Label lblSuccess)
+    private void OnFail (TextView tvResponse, TextView tvError, TextView tvValue, TextView tvTerminator, Label lblSuccess)
     {
         tvResponse.Text = string.Empty;
         tvError.Text = "No Response";
         tvValue.Text = string.Empty;
-        tvTerminator.Text = terminator;
+        tvTerminator.Text = string.Empty;
 
         lblSuccess.ColorScheme = Colors.ColorSchemes ["Error"];
         lblSuccess.Text = "Error";