Еще танцы с бубном насчет остановки отладки

Author: EvilBeaver

src/OneScript.DebugProtocol/TcpServer/DispatchingServer.cs

@@ -56,9 +56,14 @@ private void ProcessSuccess(RpcCall message, ICommunicationChannel responseChann
             try
             {
                 var methodResult = _requestProcessor.Dispatch(_requestService, message.Id, message.Parameters);
-                if(methodResult != null)
+                if (methodResult != null)
                     callResult = RpcCallResult.Respond(message, methodResult);
             }
+            catch (StopServiceException)
+            {
+                Stop();
+                return;
+            }
             catch (Exception e)
             {
                 callResult = RpcCallResult.Exception(message, e);

src/OneScript.DebugProtocol/TcpServer/StopServiceException.cs

@@ -0,0 +1,18 @@
+/*----------------------------------------------------------
+This Source Code Form is subject to the terms of the
+Mozilla Public License, v.2.0. If a copy of the MPL
+was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+----------------------------------------------------------*/
+
+using System;
+
+namespace OneScript.DebugProtocol.TcpServer
+{
+    /// <summary>
+    /// Прерывание сервера со стороны прикладного интерфейса. Кнопка "Выход" из диспетчера
+    /// </summary>
+    public class StopServiceException : ApplicationException
+    {
+    }
+}

src/OneScript.DebugServices/DefaultDebugService.cs

@@ -9,6 +9,7 @@ This Source Code Form is subject to the terms of the
 using System.Collections.Generic;
 using System.Linq;
 using OneScript.DebugProtocol;
+using OneScript.DebugProtocol.TcpServer;
 using OneScript.Language;
 using ScriptEngine.Machine;
 using StackFrame = OneScript.DebugProtocol.StackFrame;
@@ -188,6 +189,8 @@ public void Disconnect(bool terminate)
         {
             _breakpointManager.Clear();
             _threadManager.ReleaseAllThreads();
+
+            throw new StopServiceException();
         }
 
         public int[] GetThreads()

src/VSCode.DebugAdapter/DebugeeProcess.cs

@@ -166,6 +166,12 @@ public void HandleDisconnect(bool terminate)
             }
         }
 
+        public void Kill()
+        {
+            _process.Kill();
+            _process.WaitForExit(1500);
+        }
+
         public Breakpoint[] SetBreakpoints(IEnumerable<Breakpoint> breakpoints)
         {
             var confirmedBreaks = _debugger.SetMachineBreakpoints(breakpoints.ToArray());

src/VSCode.DebugAdapter/OscriptDebugSession.cs

@@ -111,8 +111,8 @@ public override void Launch(Response response, dynamic args)
             }
             catch (Exception e)
             {
-                _process.HandleDisconnect(true);
-                _process = null;
+                _process.Kill();
+                SendEvent(new TerminatedEvent());
                 Log.Error(e, "Can't connect to debug server");
                 SendErrorResponse(response, 4550, "Can't connect: " + e.ToString());
                 return;