From 872072f26b71307b8c648fd8f2e65c17bf45d376 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 15 Jan 2020 15:02:24 -0500 Subject: [PATCH] [Debugger] Update VSCodeDebuggerSession Step methods to send requests async Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/804257/ --- main/external/debugger-libs | 2 +- .../VSCodeDebuggerSession.cs | 36 +++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/main/external/debugger-libs b/main/external/debugger-libs index 44a15150f60..938be96415a 160000 --- a/main/external/debugger-libs +++ b/main/external/debugger-libs @@ -1 +1 @@ -Subproject commit 44a15150f60d1500edc6dca1983056ed747ebeec +Subproject commit 938be96415a9a2725d6d10df2130e9715cd85c79 diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs index 46ea91dd9f4..b1bbbbf03c8 100644 --- a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs +++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/VSCodeDebuggerSession.cs @@ -101,11 +101,9 @@ protected override void OnExit () protected override void OnFinish () { - try { - protocolClient.SendRequestSync (new StepOutRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepOutRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepOut request failed", ex); - } + }); } List processInfo = new List(); @@ -229,20 +227,16 @@ void UpdateExceptions () protected override void OnNextInstruction () { - try { - protocolClient.SendRequestSync (new NextRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new NextRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] NextInstruction request failed", ex); - } + }); } protected override void OnNextLine () { - try { - protocolClient.SendRequestSync (new NextRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new NextRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepOver request failed", ex); - } + }); } protected override void OnRemoveBreakEvent (BreakEventInfo eventInfo) @@ -606,8 +600,7 @@ void UpdateBreakpoints () breakpoints.Select (b => b.Key).OfType () .Where (b => b.Enabled) .Select (b => new VsCodeFunctionBreakpoint (b.FunctionName)) - .ToList ()), - (obj) => { }); + .ToList ()), null); } protected InitializeResponse Capabilities; @@ -619,20 +612,16 @@ protected override void OnSetActiveThread (long processId, long threadId) protected override void OnStepInstruction () { - try { - protocolClient.SendRequestSync (new StepInRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepInRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepInstruction request failed", ex); - } + }); } protected override void OnStepLine () { - try { - protocolClient.SendRequestSync (new StepInRequest (currentThreadId)); - } catch (Exception ex) { + protocolClient.SendRequest (new StepInRequest (currentThreadId), null, (args, ex) => { DebuggerLoggingService.LogError ("[VSCodeDebugger] StepIn request failed", ex); - } + }); } protected override void OnStop () @@ -656,7 +645,8 @@ public override void Dispose () try { protocolClient.SendRequestSync (new DisconnectRequest ()); protocolClient.Stop (); - } catch { + } catch (Exception ex) { + DebuggerLoggingService.LogError ("[VSCodeDebugger] Disconnect request failed", ex); } protocolClient = null; }