Ensure parentheses are preserved after truncating labels in table view

mislav · mislav · commit 62e4c536ce0f · 2020-11-11T15:22:34.000+01:00
diff --git a/pkg/cmd/issue/shared/display.go b/pkg/cmd/issue/shared/display.go
@@ -32,7 +32,7 @@ func PrintIssues(io *iostreams.IOStreams, prefix string, totalCount int, issues
 			table.AddField(issue.State, nil, nil)
 		}
 		table.AddField(text.ReplaceExcessiveWhitespace(issue.Title), nil, nil)
-		table.AddField(labels, nil, utils.Gray)
+		table.AddField(labels, truncateLabels, utils.Gray)
 		if table.IsTTY() {
 			table.AddField(utils.FuzzyAgo(ago), nil, utils.Gray)
 		} else {
@@ -47,6 +47,11 @@ func PrintIssues(io *iostreams.IOStreams, prefix string, totalCount int, issues
 	}
 }
 
+func truncateLabels(w int, t string) string {
+	truncated := text.Truncate(w-2, t[1:len(t)-1])
+	return fmt.Sprintf("(%s)", truncated)
+}
+
 func IssueLabelList(issue api.Issue) string {
 	if len(issue.Labels.Nodes) == 0 {
 		return ""
diff --git a/pkg/cmd/issue/shared/display_test.go b/pkg/cmd/issue/shared/display_test.go
@@ -0,0 +1,11 @@
+package shared
+
+import "testing"
+
+func Test_truncateLabels(t *testing.T) {
+	got := truncateLabels(12, "(one, two, three)")
+	expected := "(one, tw...)"
+	if got != expected {
+		t.Errorf("expected %q, got %q", expected, got)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func PrintIssues(io *iostreams.IOStreams, prefix string, totalCount int, issues`
`32`	`32`	`table.AddField(issue.State, nil, nil)`
`33`	`33`	`}`
`34`	`34`	`table.AddField(text.ReplaceExcessiveWhitespace(issue.Title), nil, nil)`
`35`		`- table.AddField(labels, nil, utils.Gray)`
	`35`	`+ table.AddField(labels, truncateLabels, utils.Gray)`
`36`	`36`	`if table.IsTTY() {`
`37`	`37`	`table.AddField(utils.FuzzyAgo(ago), nil, utils.Gray)`
`38`	`38`	`} else {`
`@@ -47,6 +47,11 @@ func PrintIssues(io *iostreams.IOStreams, prefix string, totalCount int, issues`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+func truncateLabels(w int, t string) string {`
	`51`	`+ truncated := text.Truncate(w-2, t[1:len(t)-1])`
	`52`	`+ return fmt.Sprintf("(%s)", truncated)`
	`53`	`+}`
	`54`	`+`
`50`	`55`	`func IssueLabelList(issue api.Issue) string {`
`51`	`56`	`if len(issue.Labels.Nodes) == 0 {`
`52`	`57`	`return ""`