Move startDebugger notification to PsesInternalHost.OnDebuggerStopped

Author: andyleejordan

src/PowerShellEditorServices/Services/PowerShell/Debugging/PowerShellDebugContext.cs

@@ -4,10 +4,9 @@
 using System;
 using System.Management.Automation;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Services.PowerShell.Host;
-using OmniSharp.Extensions.LanguageServer.Protocol.Server;
-using System.Threading.Tasks;
 
 namespace Microsoft.PowerShell.EditorServices.Services.PowerShell.Debugging
 {
@@ -38,24 +37,30 @@ internal class PowerShellDebugContext : IPowerShellDebugContext
     {
         private readonly ILogger _logger;
 
-        private readonly ILanguageServerFacade _languageServer;
-
         private readonly PsesInternalHost _psesHost;
 
         public PowerShellDebugContext(
             ILoggerFactory loggerFactory,
-            ILanguageServerFacade languageServer,
             PsesInternalHost psesHost)
         {
             _logger = loggerFactory.CreateLogger<PowerShellDebugContext>();
-            _languageServer = languageServer;
             _psesHost = psesHost;
         }
 
         public bool IsStopped { get; private set; }
 
+        /// <summary>
+        /// Tracks the state of the LSP debug server (not the PowerShell debugger).
+        /// </summary>
         public bool IsDebugServerActive { get; set; }
 
+        /// <summary>
+        /// Tracks if the PowerShell session started the debug server itself (true), or if it was
+        /// started by an LSP notification (false). Essentially, this marks if we're responsible for
+        /// stopping the debug server (and thus need to send a notification to do so).
+        /// </summary>
+        public bool OwnsDebugServerState { get; set; }
+
         public DebuggerStopEventArgs LastStopEventArgs { get; private set; }
 
         public event Action<object, DebuggerStopEventArgs> DebuggerStopped;
@@ -165,13 +170,6 @@ public void HandleBreakpointUpdated(BreakpointUpdatedEventArgs breakpointUpdated
 
         private void RaiseDebuggerStoppedEvent()
         {
-            if (!IsDebugServerActive)
-            {
-                // NOTE: The language server is not necessarily connected, so this must be
-                // conditional access. This shows up in unit tests.
-                _languageServer?.SendNotification("powerShell/startDebugger");
-            }
-
             DebuggerStopped?.Invoke(this, LastStopEventArgs);
         }
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System;
@@ -112,7 +112,7 @@ public PsesInternalHost(
             Name = hostInfo.Name;
             Version = hostInfo.Version;
 
-            DebugContext = new PowerShellDebugContext(loggerFactory, languageServer, this);
+            DebugContext = new PowerShellDebugContext(loggerFactory, this);
             UI = hostInfo.ConsoleReplEnabled
                 ? new EditorServicesConsolePSHostUserInterface(loggerFactory, _readLineProvider, hostInfo.PSHost.UI)
                 : new NullPSHostUI();
@@ -852,7 +852,16 @@ private bool LastKeyWasCtrlC()
 
         private void OnDebuggerStopped(object sender, DebuggerStopEventArgs debuggerStopEventArgs)
         {
+            if (!DebugContext.IsDebugServerActive)
+            {
+                // If the we've hit a breakpoint and the debug server is not active, then we need to
+                // start it (and own stopping it later).
+                DebugContext.OwnsDebugServerState = true;
+                _languageServer?.SendNotification("powerShell/startDebugger");
+            }
+
             DebugContext.SetDebuggerStopped(debuggerStopEventArgs);
+
             try
             {
                 CurrentPowerShell.WaitForRemoteOutputIfNeeded();