Merge pull request cli#532 from mingrammer/consistent-printing

mislav · web-flow · commit cb06812d192e · 2020-03-18T11:59:17.000+01:00
fix: inconsistent format between issue list and status
diff --git a/command/issue.go b/command/issue.go
@@ -14,7 +14,6 @@ import (
 	"github.com/cli/cli/git"
 	"github.com/cli/cli/internal/ghrepo"
 	"github.com/cli/cli/pkg/githubtemplate"
-	"github.com/cli/cli/pkg/text"
 	"github.com/cli/cli/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -138,23 +137,7 @@ func issueList(cmd *cobra.Command, args []string) error {
 	}
 
 	out := cmd.OutOrStdout()
-	table := utils.NewTablePrinter(out)
-	for _, issue := range issues {
-		issueNum := strconv.Itoa(issue.Number)
-		if table.IsTTY() {
-			issueNum = "#" + issueNum
-		}
-		labels := labelList(issue)
-		if labels != "" && table.IsTTY() {
-			labels = fmt.Sprintf("(%s)", labels)
-		}
-		table.AddField(issueNum, nil, colorFuncForState(issue.State))
-		table.AddField(replaceExcessiveWhitespace(issue.Title), nil, nil)
-		table.AddField(labels, nil, utils.Gray)
-		table.EndRow()
-	}
-	table.Render()
-
+	printIssues(out, "", len(issues), issues)
 	return nil
 }
 
@@ -409,21 +392,26 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 }
 
 func printIssues(w io.Writer, prefix string, totalCount int, issues []api.Issue) {
+	table := utils.NewTablePrinter(w)
 	for _, issue := range issues {
-		number := utils.Green("#" + strconv.Itoa(issue.Number))
-		coloredLabels := labelList(issue)
-		if coloredLabels != "" {
-			coloredLabels = utils.Gray(fmt.Sprintf("  (%s)", coloredLabels))
+		issueNum := strconv.Itoa(issue.Number)
+		if table.IsTTY() {
+			issueNum = "#" + issueNum
+		}
+		issueNum = prefix + issueNum
+		labels := labelList(issue)
+		if labels != "" && table.IsTTY() {
+			labels = fmt.Sprintf("(%s)", labels)
 		}
-
 		now := time.Now()
 		ago := now.Sub(issue.UpdatedAt)
-
-		fmt.Fprintf(w, "%s%s %s%s %s\n", prefix, number,
-			text.Truncate(70, replaceExcessiveWhitespace(issue.Title)),
-			coloredLabels,
-			utils.Gray(utils.FuzzyAgo(ago)))
+		table.AddField(issueNum, nil, colorFuncForState(issue.State))
+		table.AddField(replaceExcessiveWhitespace(issue.Title), nil, nil)
+		table.AddField(labels, nil, utils.Gray)
+		table.AddField(utils.FuzzyAgo(ago), nil, utils.Gray)
+		table.EndRow()
 	}
+	table.Render()
 	remaining := totalCount - len(issues)
 	if remaining > 0 {
 		fmt.Fprintf(w, utils.Gray("%sAnd %d more\n"), prefix, remaining)
diff --git a/command/issue_test.go b/command/issue_test.go
@@ -29,10 +29,10 @@ func TestIssueStatus(t *testing.T) {
 	}
 
 	expectedIssues := []*regexp.Regexp{
-		regexp.MustCompile(`#8.*carrots`),
-		regexp.MustCompile(`#9.*squash`),
-		regexp.MustCompile(`#10.*broccoli`),
-		regexp.MustCompile(`#11.*swiss chard`),
+		regexp.MustCompile(`(?m)8.*carrots.*about.*ago`),
+		regexp.MustCompile(`(?m)9.*squash.*about.*ago`),
+		regexp.MustCompile(`(?m)10.*broccoli.*about.*ago`),
+		regexp.MustCompile(`(?m)11.*swiss chard.*about.*ago`),
 	}
 
 	for _, r := range expectedIssues {

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ func TestIssueStatus(t *testing.T) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`expectedIssues := []*regexp.Regexp{`
`32`		- regexp.MustCompile(`#8.*carrots`),
`33`		- regexp.MustCompile(`#9.*squash`),
`34`		- regexp.MustCompile(`#10.*broccoli`),
`35`		- regexp.MustCompile(`#11.*swiss chard`),
	`32`	+ regexp.MustCompile(`(?m)8.carrots.about.*ago`),
	`33`	+ regexp.MustCompile(`(?m)9.squash.about.*ago`),
	`34`	+ regexp.MustCompile(`(?m)10.broccoli.about.*ago`),
	`35`	+ regexp.MustCompile(`(?m)11.swiss chard.about.*ago`),
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`for _, r := range expectedIssues {`