diff --git a/cli/board/details.go b/cli/board/details.go index a51957ac917..9a4143bc8ff 100644 --- a/cli/board/details.go +++ b/cli/board/details.go @@ -109,6 +109,7 @@ func (dr detailsResult) String() string { // ATmega328P (Old Bootloader) cpu=atmega328old // ATmega168 cpu=atmega168 t := table.New() + tab := table.New() addIfNotEmpty := func(label, content string) { if content != "" { t.AddRow(label, content) @@ -157,32 +158,34 @@ func (dr detailsResult) String() string { addIfNotEmpty(tr("Platform checksum:"), details.Platform.Checksum) t.AddRow() // get some space from above + + tab.SetColumnWidthMode(1, table.Average) for _, tool := range details.ToolsDependencies { - t.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version) + tab.AddRow(tr("Required tool:"), tool.Packager+":"+tool.Name, tool.Version) if showFullDetails { for _, sys := range tool.Systems { - t.AddRow("", tr("OS:"), sys.Host) - t.AddRow("", tr("File:"), sys.ArchiveFilename) - t.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size)) - t.AddRow("", tr("Checksum:"), sys.Checksum) - t.AddRow("", tr("URL:"), sys.Url) - t.AddRow() // get some space from above + tab.AddRow("", tr("OS:"), sys.Host) + tab.AddRow("", tr("File:"), sys.ArchiveFilename) + tab.AddRow("", tr("Size (bytes):"), fmt.Sprint(sys.Size)) + tab.AddRow("", tr("Checksum:"), sys.Checksum) + tab.AddRow("", tr("URL:"), sys.Url) + tab.AddRow() // get some space from above } } - t.AddRow() // get some space from above } + tab.AddRow() // get some space from above for _, option := range details.ConfigOptions { - t.AddRow(tr("Option:"), option.OptionLabel, "", option.Option) + tab.AddRow(tr("Option:"), option.OptionLabel, "", option.Option) for _, value := range option.Values { green := color.New(color.FgGreen) if value.Selected { - t.AddRow("", + tab.AddRow("", table.NewCell(value.ValueLabel, green), table.NewCell("✔", green), table.NewCell(option.Option+"="+value.Value, green)) } else { - t.AddRow("", + tab.AddRow("", value.ValueLabel, "", option.Option+"="+value.Value) @@ -190,10 +193,10 @@ func (dr detailsResult) String() string { } } - t.AddRow(tr("Programmers:"), tr("Id"), tr("Name")) + tab.AddRow(tr("Programmers:"), tr("ID"), tr("Name")) for _, programmer := range details.Programmers { - t.AddRow("", programmer.GetId(), programmer.GetName()) + tab.AddRow("", programmer.GetId(), programmer.GetName()) } - return t.Render() + return t.Render() + tab.Render() } diff --git a/internal/integrationtest/board/board_test.go b/internal/integrationtest/board/board_test.go index c243abd7843..b3ac071ddb4 100644 --- a/internal/integrationtest/board/board_test.go +++ b/internal/integrationtest/board/board_test.go @@ -326,7 +326,7 @@ func TestBoardDetailsListProgrammersWithoutFlag(t *testing.T) { for i, l := range split { lines[i] = strings.Fields(l) } - require.Contains(t, lines, []string{"Programmers:", "Id", "Name"}) + require.Contains(t, lines, []string{"Programmers:", "ID", "Name"}) require.Contains(t, lines, []string{"edbg", "Atmel", "EDBG"}) require.Contains(t, lines, []string{"atmel_ice", "Atmel-ICE"}) require.Contains(t, lines, []string{"sam_ice", "Atmel", "SAM-ICE"})