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

pkg,service/dap: use switch instead of ifs (#3576)

Browse Source
This commit is contained in:
Oleksandr Redko 2023-11-22 19:07:08 +02:00 committed by GitHub
parent 60a9014dcf
commit f1daaeb1b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/config/split.go
View File

@ -47,11 +47,12 @@ func SplitQuotedFields(in string, quote rune) []string {
} }
case inQuote: case inQuote:
if ch == quote { switch ch {
case quote:
state = inField state = inField
} else if ch == '\\' { case '\\':
state = inQuoteEscaped state = inQuoteEscaped
} else { default:
buf.WriteRune(ch) buf.WriteRune(ch)
} }

7
pkg/proc/core/linux_core.go
View File

@ -280,11 +280,12 @@ func readNote(r io.ReadSeeker, machineType elf.Machine) (*note, error) {
descReader := bytes.NewReader(desc) descReader := bytes.NewReader(desc)
switch note.Type { switch note.Type {
case elf.NT_PRSTATUS: case elf.NT_PRSTATUS:
if machineType == _EM_X86_64 { switch machineType {
case _EM_X86_64:
note.Desc = &linuxPrStatusAMD64{} note.Desc = &linuxPrStatusAMD64{}
} else if machineType == _EM_AARCH64 { case _EM_AARCH64:
note.Desc = &linuxPrStatusARM64{} note.Desc = &linuxPrStatusARM64{}
} else { default:
return nil, fmt.Errorf("unsupported machine type") return nil, fmt.Errorf("unsupported machine type")
} }
if err := binary.Read(descReader, binary.LittleEndian, note.Desc); err != nil { if err := binary.Read(descReader, binary.LittleEndian, note.Desc); err != nil {

13
service/dap/server.go
View File

@ -2416,17 +2416,18 @@ func (s *Session) childrenToDAPVariables(v *fullyQualifiedVariable) []dap.Variab
c := &v.Children[i] c := &v.Children[i]
cfqname := fmt.Sprintf("%s.%s", v.fullyQualifiedNameOrExpr, c.Name) cfqname := fmt.Sprintf("%s.%s", v.fullyQualifiedNameOrExpr, c.Name)
if strings.HasPrefix(c.Name, "~") || strings.HasPrefix(c.Name, ".") { switch {
case strings.HasPrefix(c.Name, "~") || strings.HasPrefix(c.Name, "."):
cfqname = "" cfqname = ""
} else if v.isScope && v.fullyQualifiedNameOrExpr == "" { case v.isScope && v.fullyQualifiedNameOrExpr == "":
cfqname = c.Name cfqname = c.Name
} else if v.fullyQualifiedNameOrExpr == "" { case v.fullyQualifiedNameOrExpr == "":
cfqname = "" cfqname = ""
} else if v.Kind == reflect.Interface { case v.Kind == reflect.Interface:
cfqname = fmt.Sprintf("%s.(%s)", v.fullyQualifiedNameOrExpr, c.Name) // c is data cfqname = fmt.Sprintf("%s.(%s)", v.fullyQualifiedNameOrExpr, c.Name) // c is data
} else if v.Kind == reflect.Ptr { case v.Kind == reflect.Ptr:
cfqname = fmt.Sprintf("(*%v)", v.fullyQualifiedNameOrExpr) // c is the nameless pointer value cfqname = fmt.Sprintf("(*%v)", v.fullyQualifiedNameOrExpr) // c is the nameless pointer value
} else if v.Kind == reflect.Complex64 || v.Kind == reflect.Complex128 { case v.Kind == reflect.Complex64 || v.Kind == reflect.Complex128:
cfqname = "" // complex children are not struct fields and can't be accessed directly cfqname = "" // complex children are not struct fields and can't be accessed directly
} }
cvalue, cvarref := s.convertVariable(c, cfqname) cvalue, cvarref := s.convertVariable(c, cfqname)

7
service/dap/server_test.go
View File

@ -5210,11 +5210,12 @@ func runDebugSessionWithBPs(t *testing.T, client *daptest.Client, cmd string, cm
cmdRequest() cmdRequest()
client.ExpectInitializedEvent(t) client.ExpectInitializedEvent(t)
if cmd == "launch" { switch cmd {
case "launch":
client.ExpectLaunchResponse(t) client.ExpectLaunchResponse(t)
} else if cmd == "attach" { case "attach":
client.ExpectAttachResponse(t) client.ExpectAttachResponse(t)
} else { default:
panic("expected launch or attach command") panic("expected launch or attach command")
} }