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

service/dap: set hit breakpoint ids (#2550)

Browse Source
This commit is contained in:
Suzy Mueller 2021-07-08 01:08:52 -04:00 committed by GitHub
parent c617ed8189
commit 0bf3e790cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/dap/server.go
View File

@ -2728,6 +2728,7 @@ func (s *Server) doRunCommand(command string, asyncSetupDone chan struct{}) {
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"
} }
stopped.Body.HitBreakpointIds = []int{state.CurrentThread.Breakpoint.ID}
} }
} else { } else {
s.exceptionErr = err s.exceptionErr = err

62
service/dap/server_test.go
View File

@ -2119,6 +2119,68 @@ func TestSetBreakpoint(t *testing.T) {
}) })
} }
func checkHitBreakpointIds(t *testing.T, se *dap.StoppedEvent, reason string, id int) {
if se.Body.ThreadId != 1 || se.Body.Reason != reason || len(se.Body.HitBreakpointIds) != 1 || se.Body.HitBreakpointIds[0] != id {
t.Errorf("got %#v, want Reason=%q, ThreadId=1, HitBreakpointIds=[]int{%d}", se, reason, id)
}
}
// TestHitBreakpointIds executes to a breakpoint and tests that
// the breakpoint ids in the stopped event are correct.
func TestHitBreakpointIds(t *testing.T) {
runTest(t, "locationsprog", func(client *daptest.Client, fixture protest.Fixture) {
runDebugSessionWithBPs(t, client, "launch",
// Launch
func() {
client.LaunchRequest("exec", fixture.Path, !stopOnEntry)
},
// Set breakpoints
fixture.Source, []int{30}, // b main.main
[]onBreakpoint{{
execute: func() {
checkStop(t, client, 1, "main.main", 30)
// Set two source breakpoints and two function breakpoints.
client.SetBreakpointsRequest(fixture.Source, []int{23, 33})
sourceBps := client.ExpectSetBreakpointsResponse(t).Body.Breakpoints
checkBreakpoints(t, client, []Breakpoint{{line: 23, path: fixture.Source, verified: true}, {line: 33, path: fixture.Source, verified: true}}, sourceBps)
client.SetFunctionBreakpointsRequest([]dap.FunctionBreakpoint{
{Name: "anotherFunction"},
{Name: "anotherFunction:1"},
})
functionBps := client.ExpectSetFunctionBreakpointsResponse(t).Body.Breakpoints
checkBreakpoints(t, client, []Breakpoint{{line: 26, path: fixture.Source, verified: true}, {line: 27, path: fixture.Source, verified: true}}, functionBps)
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
se := client.ExpectStoppedEvent(t)
checkHitBreakpointIds(t, se, "breakpoint", sourceBps[1].Id)
checkStop(t, client, 1, "main.main", 33)
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
se = client.ExpectStoppedEvent(t)
checkHitBreakpointIds(t, se, "breakpoint", sourceBps[0].Id)
checkStop(t, client, 1, "main.(*SomeType).SomeFunction", 23)
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
se = client.ExpectStoppedEvent(t)
checkHitBreakpointIds(t, se, "function breakpoint", functionBps[0].Id)
checkStop(t, client, 1, "main.anotherFunction", 26)
client.ContinueRequest(1)
client.ExpectContinueResponse(t)
se = client.ExpectStoppedEvent(t)
checkHitBreakpointIds(t, se, "function breakpoint", functionBps[1].Id)
checkStop(t, client, 1, "main.anotherFunction", 27)
},
disconnect: true,
}})
})
}
func stringContainsCaseInsensitive(got, want string) bool { func stringContainsCaseInsensitive(got, want string) bool {
return strings.Contains(strings.ToLower(got), strings.ToLower(want)) return strings.Contains(strings.ToLower(got), strings.ToLower(want))
} }