Skip to content

Commit 9dede8a

Browse files
[skip-changelog] Use gRPC function call to avoid accessing arduino/cores package directly (#2292)
1 parent d5c83ad commit 9dede8a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Diff for: internal/cli/arguments/completion.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ package arguments
1818
import (
1919
"context"
2020

21-
"github.com/arduino/arduino-cli/arduino/cores"
2221
"github.com/arduino/arduino-cli/commands"
2322
"github.com/arduino/arduino-cli/commands/board"
2423
"github.com/arduino/arduino-cli/commands/core"
2524
"github.com/arduino/arduino-cli/commands/lib"
25+
"github.com/arduino/arduino-cli/commands/upload"
2626
"github.com/arduino/arduino-cli/internal/cli/instance"
2727
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2828
)
@@ -103,10 +103,12 @@ func GetInstalledProgrammers() []string {
103103

104104
installedProgrammers := make(map[string]string)
105105
for _, board := range list.Boards {
106-
fqbn, _ := cores.ParseFQBN(board.Fqbn)
107-
_, boardPlatform, _, _, _, _ := pme.ResolveFQBN(fqbn)
108-
for programmerID, programmer := range boardPlatform.Programmers {
109-
installedProgrammers[programmerID] = programmer.Name
106+
programmers, _ := upload.ListProgrammersAvailableForUpload(context.Background(), &rpc.ListProgrammersAvailableForUploadRequest{
107+
Instance: inst,
108+
Fqbn: board.Fqbn,
109+
})
110+
for _, programmer := range programmers.GetProgrammers() {
111+
installedProgrammers[programmer.GetId()] = programmer.GetName()
110112
}
111113
}
112114

0 commit comments

Comments
 (0)