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

service/dap: make stopped event description more concise (#2523)

Browse Source
This commit is contained in:
Suzy Mueller 2021-06-04 11:35:50 -04:00 committed by GitHub
parent 152c74e94e
commit 7a3faca71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/dap/server.go
View File

@ -2540,10 +2540,10 @@ func (s *Server) doRunCommand(command string, asyncSetupDone chan struct{}) {
switch state.CurrentThread.Breakpoint.Name { switch state.CurrentThread.Breakpoint.Name {
case proc.FatalThrow: case proc.FatalThrow:
stopped.Body.Reason = "exception" stopped.Body.Reason = "exception"
stopped.Body.Description = "Paused on fatal error" stopped.Body.Description = "fatal error"
case proc.UnrecoveredPanic: case proc.UnrecoveredPanic:
stopped.Body.Reason = "exception" stopped.Body.Reason = "exception"
stopped.Body.Description = "Paused on panic" stopped.Body.Description = "panic"
} }
if strings.HasPrefix(state.CurrentThread.Breakpoint.Name, functionBpPrefix) { if strings.HasPrefix(state.CurrentThread.Breakpoint.Name, functionBpPrefix) {
stopped.Body.Reason = "function breakpoint" stopped.Body.Reason = "function breakpoint"
@ -2553,7 +2553,7 @@ func (s *Server) doRunCommand(command string, asyncSetupDone chan struct{}) {
s.exceptionErr = err s.exceptionErr = err
s.log.Error("runtime error: ", err) s.log.Error("runtime error: ", err)
stopped.Body.Reason = "exception" stopped.Body.Reason = "exception"
stopped.Body.Description = "Paused on runtime error" stopped.Body.Description = "runtime error"
stopped.Body.Text = err.Error() stopped.Body.Text = err.Error()
// Special case in the spirit of https://github.com/microsoft/vscode-go/issues/1903 // Special case in the spirit of https://github.com/microsoft/vscode-go/issues/1903
if stopped.Body.Text == "bad access" { if stopped.Body.Text == "bad access" {

16
service/dap/server_test.go
View File

@ -3213,8 +3213,8 @@ func TestBadAccess(t *testing.T) {
expectStoppedOnError := func(errorPrefix string) { expectStoppedOnError := func(errorPrefix string) {
t.Helper() t.Helper()
se := client.ExpectStoppedEvent(t) se := client.ExpectStoppedEvent(t)
if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "Paused on runtime error" || !strings.HasPrefix(se.Body.Text, errorPrefix) { if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "runtime error" || !strings.HasPrefix(se.Body.Text, errorPrefix) {
t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"Paused on runtime error\" Text=\"%s\"", se, errorPrefix) t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"runtime error\" Text=\"%s\"", se, errorPrefix)
} }
client.ExceptionInfoRequest(1) client.ExceptionInfoRequest(1)
eInfo := client.ExpectExceptionInfoResponse(t) eInfo := client.ExpectExceptionInfoResponse(t)
@ -3266,8 +3266,8 @@ func TestPanicBreakpointOnContinue(t *testing.T) {
client.ExpectContinueResponse(t) client.ExpectContinueResponse(t)
se := client.ExpectStoppedEvent(t) se := client.ExpectStoppedEvent(t)
if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "Paused on panic" { if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "panic" {
t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"Paused on panic\"", se) t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"panic\"", se)
} }
client.ExceptionInfoRequest(1) client.ExceptionInfoRequest(1)
@ -3304,8 +3304,8 @@ func TestPanicBreakpointOnNext(t *testing.T) {
client.ExpectNextResponse(t) client.ExpectNextResponse(t)
se := client.ExpectStoppedEvent(t) se := client.ExpectStoppedEvent(t)
if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "Paused on panic" { if se.Body.ThreadId != 1 || se.Body.Reason != "exception" || se.Body.Description != "panic" {
t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"Paused on panic\"", se) t.Errorf("\ngot %#v\nwant ThreadId=1 Reason=\"exception\" Description=\"panic\"", se)
} }
client.ExceptionInfoRequest(1) client.ExceptionInfoRequest(1)
@ -3336,8 +3336,8 @@ func TestFatalThrowBreakpoint(t *testing.T) {
client.ExpectContinueResponse(t) client.ExpectContinueResponse(t)
se := client.ExpectStoppedEvent(t) se := client.ExpectStoppedEvent(t)
if se.Body.Reason != "exception" || se.Body.Description != "Paused on fatal error" { if se.Body.Reason != "exception" || se.Body.Description != "fatal error" {
t.Errorf("\ngot %#v\nwant Reason=\"exception\" Description=\"Paused on fatal error\"", se) t.Errorf("\ngot %#v\nwant Reason=\"exception\" Description=\"fatal error\"", se)
} }
}, },
disconnect: true, disconnect: true,