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

service/dap,service/debugger: refactor regexp funcs

Browse Source 
Use regex.MatchString and regex.MustCompile.
This commit is contained in:
Oleksandr Redko 2023-04-28 16:49:07 +03:00 committed by Alessandro Arzilli
parent 25f0e7712e
commit 5f588d8927
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/dap/server_test.go
View File

@ -726,7 +726,7 @@ func TestPreSetBreakpoint(t *testing.T) {
if len(tResp.Body.Threads) < 2 { // 1 main + runtime if len(tResp.Body.Threads) < 2 { // 1 main + runtime
t.Errorf("\ngot %#v\nwant len(Threads)>1", tResp.Body.Threads) t.Errorf("\ngot %#v\nwant len(Threads)>1", tResp.Body.Threads)
} }
reMain, _ := regexp.Compile(`\* \[Go 1\] main.Increment \(Thread [0-9]+\)`) reMain := regexp.MustCompile(`\* \[Go 1\] main.Increment \(Thread [0-9]+\)`)
wantMain := dap.Thread{Id: 1, Name: "* [Go 1] main.Increment (Thread ...)"} wantMain := dap.Thread{Id: 1, Name: "* [Go 1] main.Increment (Thread ...)"}
wantRuntime := dap.Thread{Id: 2, Name: "[Go 2] runtime.gopark"} wantRuntime := dap.Thread{Id: 2, Name: "[Go 2] runtime.gopark"}
for _, got := range tResp.Body.Threads { for _, got := range tResp.Body.Threads {
@ -5227,7 +5227,7 @@ func TestLaunchDebugRequest(t *testing.T) {
<-done <-done
os.Stderr = rescueStderr os.Stderr = rescueStderr
rmErrRe, _ := regexp.Compile(`could not remove .*\n`) rmErrRe := regexp.MustCompile(`could not remove .*\n`)
rmErr := rmErrRe.FindString(string(err)) rmErr := rmErrRe.FindString(string(err))
if rmErr != "" { if rmErr != "" {
// On Windows, a file in use cannot be removed, resulting in "Access is denied". // On Windows, a file in use cannot be removed, resulting in "Access is denied".
@ -6809,7 +6809,7 @@ func TestLaunchAttachErrorWhenDebugInProgress(t *testing.T) {
// Both launch and attach requests should go through for additional error checking // Both launch and attach requests should go through for additional error checking
client.AttachRequest(map[string]interface{}{"mode": "local", "processId": 100}) client.AttachRequest(map[string]interface{}{"mode": "local", "processId": 100})
er := client.ExpectVisibleErrorResponse(t) er := client.ExpectVisibleErrorResponse(t)
msgRe, _ := regexp.Compile("Failed to attach: debug session already in progress at [0-9]+:[0-9]+ - use remote mode to connect to a server with an active debug session") msgRe := regexp.MustCompile("Failed to attach: debug session already in progress at [0-9]+:[0-9]+ - use remote mode to connect to a server with an active debug session")
if er.Body.Error.Id != FailedToAttach || msgRe.MatchString(er.Body.Error.Format) { if er.Body.Error.Id != FailedToAttach || msgRe.MatchString(er.Body.Error.Format) {
t.Errorf("got %#v, want Id=%d Format=%q", er, FailedToAttach, msgRe) t.Errorf("got %#v, want Id=%d Format=%q", er, FailedToAttach, msgRe)
} }
@ -6818,7 +6818,7 @@ func TestLaunchAttachErrorWhenDebugInProgress(t *testing.T) {
t.Run(mode, func(t *testing.T) { t.Run(mode, func(t *testing.T) {
client.LaunchRequestWithArgs(map[string]interface{}{"mode": mode}) client.LaunchRequestWithArgs(map[string]interface{}{"mode": mode})
er := client.ExpectVisibleErrorResponse(t) er := client.ExpectVisibleErrorResponse(t)
msgRe, _ := regexp.Compile("Failed to launch: debug session already in progress at [0-9]+:[0-9]+ - use remote attach mode to connect to a server with an active debug session") msgRe := regexp.MustCompile("Failed to launch: debug session already in progress at [0-9]+:[0-9]+ - use remote attach mode to connect to a server with an active debug session")
if er.Body.Error.Id != FailedToLaunch || msgRe.MatchString(er.Body.Error.Format) { if er.Body.Error.Id != FailedToLaunch || msgRe.MatchString(er.Body.Error.Format) {
t.Errorf("got %#v, want Id=%d Format=%q", er, FailedToLaunch, msgRe) t.Errorf("got %#v, want Id=%d Format=%q", er, FailedToLaunch, msgRe)
} }

6
service/debugger/debugger.go
View File

@ -1395,7 +1395,7 @@ func (d *Debugger) Sources(filter string) ([]string, error) {
t := proc.ValidTargets{Group: d.target} t := proc.ValidTargets{Group: d.target}
for t.Next() { for t.Next() {
for _, f := range t.BinInfo().Sources { for _, f := range t.BinInfo().Sources {
if regex.Match([]byte(f)) { if regex.MatchString(f) {
files = append(files, f) files = append(files, f)
} }
} }
@ -1464,7 +1464,7 @@ func (d *Debugger) Types(filter string) ([]string, error) {
} }
for _, typ := range types { for _, typ := range types {
if regex.Match([]byte(typ)) { if regex.MatchString(typ) {
r = append(r, typ) r = append(r, typ)
} }
} }
@ -1497,7 +1497,7 @@ func (d *Debugger) PackageVariables(filter string, cfg proc.LoadConfig) ([]*proc
} }
pvr := pv[:0] pvr := pv[:0]
for i := range pv { for i := range pv {
if regex.Match([]byte(pv[i].Name)) { if regex.MatchString(pv[i].Name) {
pvr = append(pvr, pv[i]) pvr = append(pvr, pv[i])
} }
} }