Close stray processes on exit

src/PowerShellEditorServices.Host/EditorServicesHost.cs

@@ -56,31 +56,30 @@ public class EditorServicesHost
     {
         #region Private Fields
 
-        private ILogger logger;
-        private bool enableConsoleRepl;
-        private HostDetails hostDetails;
-        private ProfilePaths profilePaths;
+        private string[] additionalModules;
         private string bundledModulesPath;
         private DebugAdapter debugAdapter;
-        private string[] additionalModules;
         private EditorSession editorSession;
+        private bool enableConsoleRepl;
         private HashSet<string> featureFlags;
+        private HostDetails hostDetails;
         private LanguageServer languageServer;
+        private ILogger logger;
+        private ProfilePaths profilePaths;
+        private TaskCompletionSource<bool> serverCompletedTask;
 
         private IServerListener languageServiceListener;
         private IServerListener debugServiceListener;
 
-        private TaskCompletionSource<bool> serverCompletedTask;
-
         #endregion
 
         #region Properties
 
-        public EditorServicesHostStatus Status { get; private set; }
+        public int DebugServicePort { get; private set; }
 
         public int LanguageServicePort { get; private set; }
 
-        public int DebugServicePort { get; private set; }
+        public EditorServicesHostStatus Status { get; private set; }
 
         #endregion
 
@@ -108,6 +107,7 @@ public EditorServicesHost(
             this.bundledModulesPath = bundledModulesPath;
             this.additionalModules = additionalModules ?? new string[0];
             this.featureFlags = new HashSet<string>(featureFlags ?? new string[0]);
+            this.serverCompletedTask = new TaskCompletionSource<bool>();
 
 #if DEBUG
             if (waitForDebugger)
@@ -226,6 +226,7 @@ private async void OnLanguageServiceClientConnect(
                     this.editorSession,
                     messageDispatcher,
                     protocolEndpoint,
+                    this.serverCompletedTask,
                     this.logger);
 
             await this.editorSession.PowerShellContext.ImportCommandsModule(
@@ -348,7 +349,6 @@ public void StopServices()
         public void WaitForCompletion()
         {
             // TODO: We need a way to know when to complete this task!
-            this.serverCompletedTask = new TaskCompletionSource<bool>();
             this.serverCompletedTask.Task.Wait();
         }
 
@@ -479,4 +479,4 @@ private IServerListener CreateServiceListener(MessageProtocolType protocol, Edit
 
         #endregion
     }
-}
+}

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -40,22 +40,31 @@ public class LanguageServer
         private Dictionary<string, Dictionary<string, MarkerCorrection>> codeActionsPerFile =
             new Dictionary<string, Dictionary<string, MarkerCorrection>>();
 
+        private TaskCompletionSource<bool> serverCompletedTask;
+
         public IEditorOperations EditorOperations
         {
             get { return this.editorOperations; }
         }
 
-        /// <param name="hostDetails">
-        /// Provides details about the host application.
-        /// </param>
+        /// <summary>
+        /// Initializes a new language server that is used for handing language server protocol messages
+        /// </summary>
+        /// <param name="editorSession">The editor session that handles the PowerShell runspace</param>
+        /// <param name="messageHandlers">An object that manages all of the message handlers</param>
+        /// <param name="messageSender">The message sender</param>
+        /// <param name="serverCompletedTask">A TaskCompletionSource<bool> that will be completed to stop the running process</param>
+        /// <param name="logger">The logger</param>
         public LanguageServer(
             EditorSession editorSession,
             IMessageHandlers messageHandlers,
             IMessageSender messageSender,
+            TaskCompletionSource<bool> serverCompletedTask,
             ILogger logger)
         {
             this.Logger = logger;
             this.editorSession = editorSession;
+            this.serverCompletedTask = serverCompletedTask;
             // Attach to the underlying PowerShell context to listen for changes in the runspace or execution status
             this.editorSession.PowerShellContext.RunspaceChanged += PowerShellContext_RunspaceChanged;
             this.editorSession.PowerShellContext.ExecutionStatusChanged += PowerShellContext_ExecutionStatusChanged;
@@ -145,7 +154,8 @@ protected Task Stop()
         {
             Logger.Write(LogLevel.Normal, "Language service is shutting down...");
 
-            // TODO: Raise an event so that the host knows to shut down
+            // complete the task so that the host knows to shut down
+            this.serverCompletedTask.SetResult(true);
 
             return Task.FromResult(true);
         }
@@ -156,7 +166,6 @@ private async Task HandleShutdownRequest(
             RequestContext<object> requestContext)
         {
             // Allow the implementor to shut down gracefully
-            await this.Stop();
 
             await requestContext.SendResult(new object());
         }