Пофиксил закрытие сервера отладки, добавил Dispose там, где его не было

(cherry picked from commit d85fb50)

src/OneScript.DebugProtocol/TcpServer/DefaultMessageServer.cs

@@ -21,6 +21,11 @@ public DefaultMessageServer(ICommunicationChannel protocolChannel)
  {
  _protocolChannel = protocolChannel;
  }
+
+ /// <summary>
+ /// Имя, назначаемое потоку сервера. Полезно для отладки и диагностики.
+ /// </summary>
+ public string ServerThreadName { get; set; }
 
  public void Start()
  {
@@ -85,6 +90,11 @@ private void RunCommandsLoop()
  });
 
  _messageThread.IsBackground = true;
+ if (ServerThreadName != default)
+ {
+ _messageThread.Name = ServerThreadName;
+ }
+
  _messageThread.Start();
  }
 

src/OneScript.DebugServices/MachineWaitToken.cs

@@ -5,26 +5,28 @@ This Source Code Form is subject to the terms of the
 at http://mozilla.org/MPL/2.0/.
 ----------------------------------------------------------*/
 
+using System;
 using System.Threading;
 using ScriptEngine.Machine;
 
 namespace OneScript.DebugServices
 {
- public class MachineWaitToken
+ public class MachineWaitToken: IDisposable
  {
- private ManualResetEventSlim _threadEvent;
+ private ManualResetEventSlim _threadEvent = new ManualResetEventSlim();
 
- public MachineWaitToken()
- {
- _threadEvent = new ManualResetEventSlim();
- }
-
  public MachineInstance Machine { get; set; }
 
  public void Wait() => _threadEvent.Wait();
 
  public void Set() => _threadEvent.Set();
 
  public void Reset() => _threadEvent.Reset();
+
+ public void Dispose()
+ {
+ Machine.UnsetDebugMode();
+ _threadEvent.Dispose();
+ }
  }
 }

src/OneScript.DebugServices/ThreadManager.cs

@@ -87,6 +87,7 @@ public void Dispose()
  foreach (var machineWaitToken in tokens)
  {
  machineWaitToken.Machine.MachineStopped -= Machine_MachineStopped;
+ machineWaitToken.Dispose();
  }
 
  _machinesOnThreads.Clear();

src/ScriptEngine/ScriptingEngine.cs

@@ -1,4 +1,4 @@
-/*----------------------------------------------------------
+/*----------------------------------------------------------
 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 
@@ -196,6 +196,7 @@ public void SetCodeStatisticsCollector(ICodeStatCollector collector)
 
  public void Dispose()
  {
+ DebugController?.Dispose();
  AttachedScriptsFactory.SetInstance(null);
  }