PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service/dap: fallback to CurrentThread if SelectedGouroutine is not available (#2422)

Browse Source 
Co-authored-by: Polina Sokolova <polinasok@users.noreply.github.com>
This commit is contained in:
polinasok 2021-04-12 15:00:26 -07:00 committed by GitHub
parent 781ad72d62
commit fe616c27ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
service/dap/server.go
View File

@ -916,6 +916,15 @@ func (s *Server) onStepOutRequest(request *dap.StepOutRequest) {
s.doStepCommand(api.StepOut, request.Arguments.ThreadId) s.doStepCommand(api.StepOut, request.Arguments.ThreadId)
} }
func stoppedGoroutineID(state *api.DebuggerState) (id int) {
if state.SelectedGoroutine != nil {
id = state.SelectedGoroutine.ID
} else if state.CurrentThread != nil {
id = state.CurrentThread.GoroutineID
}
return id
}
func (s *Server) doStepCommand(command string, threadId int) { func (s *Server) doStepCommand(command string, threadId int) {
// Use SwitchGoroutine to change the current goroutine. // Use SwitchGoroutine to change the current goroutine.
state, err := s.debugger.Command(&api.DebuggerCommand{Name: api.SwitchGoroutine, GoroutineID: threadId}, nil) state, err := s.debugger.Command(&api.DebuggerCommand{Name: api.SwitchGoroutine, GoroutineID: threadId}, nil)
@ -925,10 +934,8 @@ func (s *Server) doStepCommand(command string, threadId int) {
// since we already sent the step response. // since we already sent the step response.
stopped := &dap.StoppedEvent{Event: *newEvent("stopped")} stopped := &dap.StoppedEvent{Event: *newEvent("stopped")}
stopped.Body.AllThreadsStopped = true stopped.Body.AllThreadsStopped = true
if state.SelectedGoroutine != nil { if state != nil {
stopped.Body.ThreadId = state.SelectedGoroutine.ID stopped.Body.ThreadId = stoppedGoroutineID(state)
} else if state.CurrentThread != nil {
stopped.Body.ThreadId = state.CurrentThread.GoroutineID
} }
stopped.Body.Reason = "error" stopped.Body.Reason = "error"
stopped.Body.Text = err.Error() stopped.Body.Text = err.Error()
@ -1378,9 +1385,7 @@ func (s *Server) onEvaluateRequest(request *dap.EvaluateRequest) {
s.resetHandlesForStop() s.resetHandlesForStop()
stopped := &dap.StoppedEvent{Event: *newEvent("stopped")} stopped := &dap.StoppedEvent{Event: *newEvent("stopped")}
stopped.Body.AllThreadsStopped = true stopped.Body.AllThreadsStopped = true
if state.SelectedGoroutine != nil { stopped.Body.ThreadId = stoppedGoroutineID(state)
stopped.Body.ThreadId = state.SelectedGoroutine.ID
}
stopped.Body.Reason = s.debugger.StopReason().String() stopped.Body.Reason = s.debugger.StopReason().String()
s.send(stopped) s.send(stopped)
// TODO(polina): once this is asynchronous, we could wait to reply until the user // TODO(polina): once this is asynchronous, we could wait to reply until the user
@ -1579,9 +1584,7 @@ func (s *Server) doCommand(command string) {
stopped.Body.AllThreadsStopped = true stopped.Body.AllThreadsStopped = true
if err == nil { if err == nil {
if state.SelectedGoroutine != nil { stopped.Body.ThreadId = stoppedGoroutineID(state)
stopped.Body.ThreadId = state.SelectedGoroutine.ID
}
switch s.debugger.StopReason() { switch s.debugger.StopReason() {
case proc.StopNextFinished: case proc.StopNextFinished:
@ -1589,7 +1592,7 @@ func (s *Server) doCommand(command string) {
default: default:
stopped.Body.Reason = "breakpoint" stopped.Body.Reason = "breakpoint"
} }
if state.CurrentThread.Breakpoint != nil { if state.CurrentThread != nil && state.CurrentThread.Breakpoint != nil {
switch state.CurrentThread.Breakpoint.Name { switch state.CurrentThread.Breakpoint.Name {
case proc.FatalThrow: case proc.FatalThrow:
stopped.Body.Reason = "fatal error" stopped.Body.Reason = "fatal error"
@ -1608,7 +1611,7 @@ func (s *Server) doCommand(command string) {
} }
state, err := s.debugger.State( /*nowait*/ true) state, err := s.debugger.State( /*nowait*/ true)
if err == nil { if err == nil {
stopped.Body.ThreadId = state.CurrentThread.GoroutineID stopped.Body.ThreadId = stoppedGoroutineID(state)
} }
s.send(stopped) s.send(stopped)