Skip to content

Commit 0aea6cd

Browse files
committed
Обратносовместимый метод остановки отладчика
1 parent ae58ec6 commit 0aea6cd

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

src/OneScript.DebugProtocol/IDebugEventListener.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ namespace OneScript.DebugProtocol
1212
/// </summary>
1313
public interface IDebugEventListener
1414
{
15-
void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage);
15+
void ThreadStopped(int threadId, ThreadStopReason reason);
16+
17+
void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage);
1618

1719
void ProcessExited(int exitCode);
1820
}

src/OneScript.DebugServices/DefaultDebugController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ private void ThreadManagerOnThreadStopped(object sender, ThreadStoppedEventArgs
5555
{
5656
var token = _threadManager.GetTokenForThread(e.ThreadId);
5757
token.Reset();
58-
_callbackService.ThreadStopped(e.ThreadId, ConvertStopReason(e.StopReason), e.ErrorMessage);
58+
59+
_callbackService.ThreadStoppedEx(e.ThreadId, ConvertStopReason(e.StopReason), e.ErrorMessage);
5960
token.Wait();
6061
}
6162

src/OneScript.DebugServices/TcpEventCallbackChannel.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@ public TcpEventCallbackChannel(ICommunicationChannel channel)
2121
_channel = channel;
2222
}
2323

24-
public void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage)
24+
public void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage)
2525
{
26-
var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStopped), threadId, reason, errorMessage);
26+
var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStoppedEx), threadId, reason, errorMessage);
27+
_channel.Write(dto);
28+
}
29+
30+
public void ThreadStopped(int threadId, ThreadStopReason reason)
31+
{
32+
var dto = RpcCall.Create(nameof(IDebugEventListener), nameof(ThreadStopped), threadId, reason);
2733
_channel.Write(dto);
2834
}
2935

src/VSCode.DebugAdapter/OscriptDebugSession.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,16 @@ private string NormalizeDriveLetter(string path)
274274

275275
}
276276

277-
public void ThreadStopped(int threadId, ThreadStopReason reason, string errorMessage)
277+
public void ThreadStopped(int threadId, ThreadStopReason reason)
278+
{
279+
LogEventOccured();
280+
_framesHandles.Reset();
281+
_variableHandles.Reset();
282+
283+
SendEvent(new StoppedEvent(threadId, reason.ToString()));
284+
}
285+
286+
public void ThreadStoppedEx(int threadId, ThreadStopReason reason, string errorMessage)
278287
{
279288
LogEventOccured();
280289
_framesHandles.Reset();

src/VSCode.DebugAdapter/OscriptProtocols/Tcp/TcpDebugServerClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ private void WriteCommand(object[] data, [CallerMemberName] string command = "")
120120
private T GetResponse<T>()
121121
{
122122
var rpcResult = _processor.GetResult();
123-
Log.Verbose("Response received {Result} = {Value}", rpcResult.Id, rpcResult.ReturnValue);
123+
Log.Debug("Response received {Result} = {Value}", rpcResult.Id, rpcResult.ReturnValue);
124124
if (rpcResult.ReturnValue is RpcExceptionDto excDto)
125125
{
126-
Log.Verbose("RPC Exception received: {Description}", excDto.Description);
126+
Log.Debug("RPC Exception received: {Description}", excDto.Description);
127127
throw new RpcOperationException(excDto);
128128
}
129129

0 commit comments

Comments
 (0)