Обратносовместимый метод остановки отладчика

EvilBeaver · Nov 12, 2024 · 0aea6cd · 0aea6cd
1 parent ae58ec6
commit 0aea6cd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/src/OneScript.DebugProtocol/IDebugEventListener.cs b/src/OneScript.DebugProtocol/IDebugEventListener.cs
@@ -12,7 +12,9 @@ namespace OneScript.DebugProtocol
     /// </summary>
     public interface IDebugEventListener
     {
-        void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage);
+        void ThreadStopped(int threadId, ThreadStopReason reason);
+
+        void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage);
 
         void ProcessExited(int exitCode);
     }

diff --git a/src/OneScript.DebugServices/DefaultDebugController.cs b/src/OneScript.DebugServices/DefaultDebugController.cs
@@ -55,7 +55,8 @@ private void ThreadManagerOnThreadStopped(object sender, ThreadStoppedEventArgs
         {
             var token = _threadManager.GetTokenForThread(e.ThreadId);
             token.Reset();
-            _callbackService.ThreadStopped(e.ThreadId, ConvertStopReason(e.StopReason), e.ErrorMessage);
+
+            _callbackService.ThreadStoppedEx(e.ThreadId, ConvertStopReason(e.StopReason), e.ErrorMessage);
             token.Wait();
         }
 

diff --git a/src/OneScript.DebugServices/TcpEventCallbackChannel.cs b/src/OneScript.DebugServices/TcpEventCallbackChannel.cs
@@ -21,9 +21,15 @@ public TcpEventCallbackChannel(ICommunicationChannel channel)
             _channel = channel;
         }
 
-        public void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage)
+        public void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage)
         {
-            var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStopped), threadId, reason, errorMessage);
+            var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStoppedEx), threadId, reason, errorMessage);
+            _channel.Write(dto);
+        }
+
+        public void ThreadStopped(int threadId, ThreadStopReason reason)
+        {
+            var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStopped), threadId, reason);
             _channel.Write(dto);
         }
 

diff --git a/src/VSCode.DebugAdapter/OscriptDebugSession.cs b/src/VSCode.DebugAdapter/OscriptDebugSession.cs
@@ -274,7 +274,16 @@ private string NormalizeDriveLetter(string path)
 
         }
 
-        public void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage)
+        public void ThreadStopped(int threadId, ThreadStopReason reason)
+        {
+            LogEventOccured();
+            _framesHandles.Reset();
+            _variableHandles.Reset();
+
+            SendEvent(new StoppedEvent(threadId, reason.ToString()));
+        }
+
+        public void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage)
         {
             LogEventOccured();
             _framesHandles.Reset();

diff --git a/src/VSCode.DebugAdapter/OscriptProtocols/Tcp/TcpDebugServerClient.cs b/src/VSCode.DebugAdapter/OscriptProtocols/Tcp/TcpDebugServerClient.cs
@@ -120,10 +120,10 @@ private void WriteCommand(object[] data, [CallerMemberName] string command = "")
         private T GetResponse<T>()
         {
             var rpcResult = _processor.GetResult();
-            Log.Verbose("Response received {Result} = {Value}", rpcResult.Id, rpcResult.ReturnValue);
+            Log.Debug("Response received {Result} = {Value}", rpcResult.Id, rpcResult.ReturnValue);
             if (rpcResult.ReturnValue is RpcExceptionDto excDto)
             {
-                Log.Verbose("RPC Exception received: {Description}", excDto.Description);
+                Log.Debug("RPC Exception received: {Description}", excDto.Description);
                 throw new RpcOperationException(excDto);
             }