src/debugAdapter: revert cl/253578
There were some issues caused by not sending a stopped event to
the client every time that the continue callback was called. This
change reverts the logic to skip calling handleReenterDebug in
order to get back to a state where the debugger issues stopped events
every time. This should fix issues with the debugger appearing to
be running when it is stopped.
Updates golang/vscode-go#149, golang/vscode-go#172, and golang/vscode-go#759
Change-Id: I70aae05bc3bf50499b046594a43d972ec01091cf
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/262257
Run-TryBot: Suzy Mueller <suzmue@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Trust: Suzy Mueller <suzmue@golang.org>
Trust: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
diff --git a/src/debugAdapter/goDebug.ts b/src/debugAdapter/goDebug.ts
index 5e50dc6..e6f952c 100644
--- a/src/debugAdapter/goDebug.ts
+++ b/src/debugAdapter/goDebug.ts
@@ -2274,26 +2274,21 @@
log('continue state', state);
this.debugState = state;
- // Check if the current thread was stopped on a breakpoint.
- // Other stopping events (eg pause) create their own StoppedEvents,
- // if necessary.
+ let reason = 'breakpoint';
+ // Check if the current thread was stopped on 'panic' or 'fatal error'.
if (!!state.currentThread && !!state.currentThread.breakPoint) {
const bp = state.currentThread.breakPoint;
if (bp.id === unrecoveredPanicID) {
// If the breakpoint is actually caused by a panic,
// we want to return on "panic".
- this.handleReenterDebug('panic');
+ reason = 'panic';
} else if (bp.id === fatalThrowID) {
// If the breakpoint is actually caused by a fatal throw,
// we want to return on "fatal error".
- this.handleReenterDebug('fatal error');
- } else {
- this.handleReenterDebug('breakpoint');
+ reason = 'fatal error';
}
- } else if (state.exited) {
- // Notify the client if the program has exited.
- this.handleReenterDebug('');
}
+ this.handleReenterDebug(reason);
};
// If called when setting breakpoint internally, we want the error to bubble up.
