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

service/dap: add the concrete type to interface type (#3510)

Browse Source
This commit is contained in:
Suzy Mueller 2023-10-03 11:51:46 -04:00 committed by GitHub
parent 255afbfdb7
commit b041bd8e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/dap/server.go
View File

@ -2519,6 +2519,15 @@ func (s *Session) getTypeIfSupported(v *proc.Variable) string {
if !s.clientCapabilities.supportsVariableType { if !s.clientCapabilities.supportsVariableType {
return "" return ""
} }
switch v.Kind {
case reflect.Interface:
if len(v.Children) > 0 {
vapi := api.ConvertVar(v)
if vapi.Children[0].Kind != reflect.Invalid {
return fmt.Sprintf("%s(%s)", vapi.Type, vapi.Children[0].Type)
}
}
}
return v.TypeString() return v.TypeString()
} }

16
service/dap/server_test.go
View File

@ -1783,7 +1783,7 @@ func TestScopesAndVariablesRequests2(t *testing.T) {
checkVarExact(t, locals, -1, "fn2", "fn2", "nil", "main.functype", noChildren) checkVarExact(t, locals, -1, "fn2", "fn2", "nil", "main.functype", noChildren)
// reflect.Kind == Interface // reflect.Kind == Interface
checkVarExact(t, locals, -1, "ifacenil", "ifacenil", "interface {} nil", "interface {}", noChildren) checkVarExact(t, locals, -1, "ifacenil", "ifacenil", "interface {} nil", "interface {}", noChildren)
ref = checkVarExact(t, locals, -1, "iface2", "iface2", "interface {}(string) \"test\"", "interface {}", hasChildren) ref = checkVarExact(t, locals, -1, "iface2", "iface2", "interface {}(string) \"test\"", "interface {}(string)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
iface2 := client.ExpectVariablesResponse(t) iface2 := client.ExpectVariablesResponse(t)
@ -1791,7 +1791,7 @@ func TestScopesAndVariablesRequests2(t *testing.T) {
checkVarExact(t, iface2, 0, "data", "iface2.(data)", `"test"`, "string", noChildren) checkVarExact(t, iface2, 0, "data", "iface2.(data)", `"test"`, "string", noChildren)
validateEvaluateName(t, client, iface2, 0) validateEvaluateName(t, client, iface2, 0)
} }
ref = checkVarExact(t, locals, -1, "iface4", "iface4", "interface {}([]go/constant.Value) [4]", "interface {}", hasChildren) ref = checkVarExact(t, locals, -1, "iface4", "iface4", "interface {}([]go/constant.Value) [4]", "interface {}([]go/constant.Value)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
iface4 := client.ExpectVariablesResponse(t) iface4 := client.ExpectVariablesResponse(t)
@ -1801,7 +1801,7 @@ func TestScopesAndVariablesRequests2(t *testing.T) {
client.VariablesRequest(ref) client.VariablesRequest(ref)
iface4data := client.ExpectVariablesResponse(t) iface4data := client.ExpectVariablesResponse(t)
checkChildren(t, iface4data, "iface4.data", 1) checkChildren(t, iface4data, "iface4.data", 1)
ref = checkVarExact(t, iface4data, 0, "[0]", "iface4.(data)[0]", "go/constant.Value(go/constant.int64Val) 4", "go/constant.Value", hasChildren) ref = checkVarExact(t, iface4data, 0, "[0]", "iface4.(data)[0]", "go/constant.Value(go/constant.int64Val) 4", "go/constant.Value(go/constant.int64Val)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
iface4data0 := client.ExpectVariablesResponse(t) iface4data0 := client.ExpectVariablesResponse(t)
@ -1812,7 +1812,7 @@ func TestScopesAndVariablesRequests2(t *testing.T) {
} }
} }
checkVarExact(t, locals, -1, "errnil", "errnil", "error nil", "error", noChildren) checkVarExact(t, locals, -1, "errnil", "errnil", "error nil", "error", noChildren)
ref = checkVarExact(t, locals, -1, "err1", "err1", "error(*main.astruct) *{A: 1, B: 2}", "error", hasChildren) ref = checkVarExact(t, locals, -1, "err1", "err1", "error(*main.astruct) *{A: 1, B: 2}", "error(*main.astruct)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
err1 := client.ExpectVariablesResponse(t) err1 := client.ExpectVariablesResponse(t)
@ -1825,7 +1825,7 @@ func TestScopesAndVariablesRequests2(t *testing.T) {
client.VariablesRequest(ref) client.VariablesRequest(ref)
ptrinf_val := client.ExpectVariablesResponse(t) ptrinf_val := client.ExpectVariablesResponse(t)
checkChildren(t, ptrinf_val, "*ptrinf", 1) checkChildren(t, ptrinf_val, "*ptrinf", 1)
ref = checkVarExact(t, ptrinf_val, 0, "", "(*ptrinf)", "interface {}(**interface {}) **...", "interface {}", hasChildren) ref = checkVarExact(t, ptrinf_val, 0, "", "(*ptrinf)", "interface {}(**interface {}) **...", "interface {}(**interface {})", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
ptrinf_val_data := client.ExpectVariablesResponse(t) ptrinf_val_data := client.ExpectVariablesResponse(t)
@ -2307,7 +2307,7 @@ func TestVariablesLoading(t *testing.T) {
// Auto-loading happens here // Auto-loading happens here
client.VariablesRequest(ref) client.VariablesRequest(ref)
niI1Data := client.ExpectVariablesResponse(t) niI1Data := client.ExpectVariablesResponse(t)
ref = checkVarExact(t, niI1Data, 0, "[0]", "ni[0].(data)[0]", "interface {}(int) 123", "interface {}", hasChildren) ref = checkVarExact(t, niI1Data, 0, "[0]", "ni[0].(data)[0]", "interface {}(int) 123", "interface {}(int)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
niI1DataI2 := client.ExpectVariablesResponse(t) niI1DataI2 := client.ExpectVariablesResponse(t)
@ -4434,7 +4434,7 @@ func TestEvaluateCallRequest(t *testing.T) {
client.VariablesRequest(ref) client.VariablesRequest(ref)
rv := client.ExpectVariablesResponse(t) rv := client.ExpectVariablesResponse(t)
checkChildren(t, rv, "rv", 1) checkChildren(t, rv, "rv", 1)
ref = checkVarExact(t, rv, 0, "~panic", "", `interface {}(string) "callpanic panicked"`, "interface {}", hasChildren) ref = checkVarExact(t, rv, 0, "~panic", "", `interface {}(string) "callpanic panicked"`, "interface {}(string)", hasChildren)
if ref > 0 { if ref > 0 {
client.VariablesRequest(ref) client.VariablesRequest(ref)
p := client.ExpectVariablesResponse(t) p := client.ExpectVariablesResponse(t)
@ -6096,7 +6096,7 @@ func TestSetVariable(t *testing.T) {
tester.evaluate("ifacenil", "interface {}(*main.astruct) *{A: 1, B: 2}", hasChildren) tester.evaluate("ifacenil", "interface {}(*main.astruct) *{A: 1, B: 2}", hasChildren)
// interface.(data) // interface.(data)
iface1Ref := checkVarExact(t, locals, -1, "iface1", "iface1", "interface {}(*main.astruct) *{A: 1, B: 2}", "interface {}", hasChildren) iface1Ref := checkVarExact(t, locals, -1, "iface1", "iface1", "interface {}(*main.astruct) *{A: 1, B: 2}", "interface {}(*main.astruct)", hasChildren)
iface1 := tester.variables(iface1Ref) iface1 := tester.variables(iface1Ref)
iface1DataRef := checkVarExact(t, iface1, -1, "data", "iface1.(data)", "*main.astruct {A: 1, B: 2}", "*main.astruct", hasChildren) iface1DataRef := checkVarExact(t, iface1, -1, "data", "iface1.(data)", "*main.astruct {A: 1, B: 2}", "*main.astruct", hasChildren)
iface1Data := tester.variables(iface1DataRef) iface1Data := tester.variables(iface1DataRef)