Don't call PowerShell.BeginStop when stopped in the debugger

Author: daviwil

src/PowerShellEditorServices.Protocol/Server/DebugAdapter.cs

@@ -324,9 +324,6 @@ protected async Task HandleDisconnectRequest(
                     {
                         await requestContext.SendResult(null);
                         this.editorSession.PowerShellContext.SessionStateChanged -= handler;
-
-                        // Stop the server
-                        await this.Stop();
                     }
                 };
 

src/PowerShellEditorServices/Session/PowerShellContext.cs

@@ -706,13 +706,16 @@ public void AbortExecution()
             {
                 Logger.Write(LogLevel.Verbose, "Execution abort requested...");
 
-                this.powerShell.BeginStop(null, null);
-                this.SessionState = PowerShellContextState.Aborting;
-
                 if (this.IsDebuggerStopped)
                 {
                     this.ResumeDebugger(DebuggerResumeAction.Stop);
                 }
+                else
+                {
+                    this.powerShell.BeginStop(null, null);
+                }
+
+                this.SessionState = PowerShellContextState.Aborting;
             }
             else
             {
@@ -1114,7 +1117,6 @@ private static SessionStateChangedEventArgs TranslateInvocationStateInfo(PSInvoc
                     break;
 
                 case PSInvocationState.Stopping:
-                    // TODO: Collapse this so that the result shows that execution was aborted
                     newState = PowerShellContextState.Aborting;
                     break;
 

test/PowerShellEditorServices.Test/Debugging/DebugServiceTests.cs

@@ -474,7 +474,7 @@ await this.AssertStateChange(
             this.debugService.Abort();
             await this.AssertStateChange(
                 PowerShellContextState.Ready,
-                PowerShellExecutionResult.Aborted);
+                PowerShellExecutionResult.Completed);
         }
 
         [Fact]
@@ -497,7 +497,7 @@ await this.AssertStateChange(
             this.debugService.Abort();
             await this.AssertStateChange(
                 PowerShellContextState.Ready,
-                PowerShellExecutionResult.Aborted);
+                PowerShellExecutionResult.Completed);
         }
 
         [Fact]