Commit 74441de

author

Luca Bianconi

committed

refactor: style

1 parent 076dfce commit 74441deCopy full SHA for 74441de

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ type Fqbn struct {`
`35`	`35`
`36`	`36`	`// AddToCommand adds the flags used to set fqbn and the board options to the specified Command`
`37`	`37`	`func (f Fqbn) AddToCommand(cmd cobra.Command) {`
`38`		`- f.addToCommand(cmd, true)`
	`38`	`+ f.configureForCommand(cmd, true)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// AddToCommandWithoutBoardOptions adds the flags used to set fqbn to the specified Command, board options flag is not provided`
`42`	`42`	`func (f Fqbn) AddToCommandWithoutBoardOptions(cmd cobra.Command) {`
`43`		`- f.addToCommand(cmd, false)`
	`43`	`+ f.configureForCommand(cmd, false)`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (f Fqbn) addToCommand(cmd cobra.Command, enableBoardOptions bool) bool {`
	`46`	`+func (f Fqbn) configureForCommand(cmd cobra.Command, enableBoardOptions bool) bool {`
`47`	`47`	`cmd.Flags().StringVarP(&f.fqbn, "fqbn", "b", "", tr("Fully Qualified Board Name, e.g.: arduino:avr:uno"))`
`48`	`48`	`cmd.RegisterFlagCompletionFunc("fqbn", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`49`	`49`	`return GetInstalledBoards(), cobra.ShellCompDirectiveDefault`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`package board`
`17`	`17`
`18`	`18`	`import (`
	`19`	`+ "errors"`
`19`	`20`	`"fmt"`
`20`	`21`	`"os"`
`21`	`22`	`"sort"`
`@@ -65,18 +66,19 @@ func runListCommand(cmd *cobra.Command, args []string) {`
`65`	`66`	`return`
`66`	`67`	`}`
`67`	`68`
`68`		`- ports, discvoeryErrors, err := board.List(&rpc.BoardListRequest{`
	`69`	`+ ports, discoveryErrors, err := board.List(&rpc.BoardListRequest{`
`69`	`70`	`Instance: inst,`
`70`	`71`	`Timeout: timeoutArg.Get().Milliseconds(),`
`71`	`72`	`Fqbn: fqbn.String(),`
`72`	`73`	`})`
	`74`	`+ var invalidFQBNErr *arduino.InvalidFQBNError`
	`75`	`+ if errors.As(err, &invalidFQBNErr) {`
	`76`	`+ feedback.Fatal(tr(err.Error()), feedback.ErrBadArgument)`
	`77`	`+ }`
`73`	`78`	`if err != nil {`
`74`		`- if _, isFqbnError := err.(*arduino.InvalidFQBNError); isFqbnError {`
`75`		`- feedback.Fatal(tr(err.Error()), feedback.ErrBadArgument)`
`76`		`- }`
`77`	`79`	`feedback.Warning(tr("Error detecting boards: %v", err))`
`78`	`80`	`}`
`79`		`- for _, err := range discvoeryErrors {`
	`81`	`+ for _, err := range discoveryErrors {`
`80`	`82`	`feedback.Warning(tr("Error starting discovery: %v", err))`
`81`	`83`	`}`
`82`	`84`	`feedback.PrintResult(result{ports})`

Comments

(0)