Merge pull request #1762 from SeeminglyScience/more-debug-changes

Fix prompt spam and general debugger reliability improvements

Author: andyleejordan

src/PowerShellEditorServices/Services/PowerShell/Execution/SynchronousPowerShellTask.cs

@@ -333,7 +333,7 @@ private void StopDebuggerIfRemoteDebugSessionFailed()
 
         private void CancelNormalExecution()
         {
-            if (_pwsh.Runspace.RunspaceStateInfo.IsUsable())
+            if (!_pwsh.Runspace.RunspaceStateInfo.IsUsable())
             {
                 return;
             }

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

@@ -680,18 +680,30 @@ private void RunExecutionLoop(bool isForDebug = false)
                 }
 
                 using CancellationScope cancellationScope = _cancellationContext.EnterScope(false);
-                DoOneRepl(cancellationScope.CancellationToken);
+
+                try
+                {
+                    DoOneRepl(cancellationScope.CancellationToken);
+                }
+                catch (OperationCanceledException)
+                {
+                    if (isForDebug)
+                    {
+                        while (Runspace is { RunspaceIsRemote: true } remoteRunspace
+                            && !remoteRunspace.RunspaceStateInfo.IsUsable())
+                        {
+                            PopPowerShell(RunspaceChangeAction.Exit);
+                        }
+
+                        return;
+                    }
+                }
 
                 while (!ShouldExitExecutionLoop
                     && !cancellationScope.CancellationToken.IsCancellationRequested
                     && _taskQueue.TryTake(out ISynchronousTask task))
                 {
                     task.ExecuteSynchronously(cancellationScope.CancellationToken);
-                    while (Runspace is { RunspaceIsRemote: true } remoteRunspace
-                        && !remoteRunspace.RunspaceStateInfo.IsUsable())
-                    {
-                        PopPowerShell(RunspaceChangeAction.Exit);
-                    }
                 }
 
                 if (_shouldExit
@@ -759,7 +771,7 @@ private void DoOneRepl(CancellationToken cancellationToken)
             }
             catch (OperationCanceledException)
             {
-                // Do nothing, since we were just cancelled
+                throw;
             }
             // Propagate exceptions thrown from the debugger when quitting.
             catch (TerminateException)
@@ -828,6 +840,7 @@ public void WriteWithPrompt(PSCommand command, CancellationToken cancellationTok
 
         private string InvokeReadLine(CancellationToken cancellationToken)
         {
+            cancellationToken.ThrowIfCancellationRequested();
             try
             {
                 _readKeyCancellationToken = cancellationToken;