Skip to content

Commit 86f80d1

Browse files
committed
Allow optional programmer in debug
1 parent 01de174 commit 86f80d1

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

Diff for: commands/debug/debug_info.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,14 @@ func getDebugProperties(req *rpc.GetDebugConfigRequest, pme *packagemanager.Expl
169169
}
170170
}
171171

172-
if req.GetProgrammer() == "" {
173-
return nil, &arduino.MissingProgrammerError{}
174-
}
175-
if p, ok := platformRelease.Programmers[req.GetProgrammer()]; ok {
176-
toolProperties.Merge(p.Properties)
177-
} else if refP, ok := referencedPlatformRelease.Programmers[req.GetProgrammer()]; ok {
178-
toolProperties.Merge(refP.Properties)
179-
} else {
180-
return nil, &arduino.ProgrammerNotFoundError{Programmer: req.GetProgrammer()}
172+
if req.GetProgrammer() != "" {
173+
if p, ok := platformRelease.Programmers[req.GetProgrammer()]; ok {
174+
toolProperties.Merge(p.Properties)
175+
} else if refP, ok := referencedPlatformRelease.Programmers[req.GetProgrammer()]; ok {
176+
toolProperties.Merge(refP.Properties)
177+
} else {
178+
return nil, &arduino.ProgrammerNotFoundError{Programmer: req.GetProgrammer()}
179+
}
181180
}
182181

183182
var importPath *paths.Path

Diff for: commands/debug/debug_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ func TestGetCommandLine(t *testing.T) {
6565
pme, release := pm.NewExplorer()
6666
defer release()
6767

68-
{
69-
// Check programmer required
70-
_, err := getCommandLine(req, pme)
71-
require.Error(t, err)
72-
}
73-
7468
{
7569
// Check programmer not found
7670
req.Programmer = "not-existent"

0 commit comments

Comments
 (0)