add more colorf functions

vilmibm · vilmibm · commit 09c1620d0bdb · 2021-03-11T17:00:41.000-06:00
diff --git a/pkg/cmd/pr/shared/comments.go b/pkg/cmd/pr/shared/comments.go
@@ -99,9 +99,9 @@ func formatComment(io *iostreams.IOStreams, comment Comment, newest bool) (strin
 		fmt.Fprint(&b, formatCommentStatus(cs, comment.Status()))
 	}
 	if comment.Association() != "NONE" {
-		fmt.Fprint(&b, cs.Bold(fmt.Sprintf(" (%s)", strings.Title(strings.ToLower(comment.Association())))))
+		fmt.Fprint(&b, cs.Boldf(" (%s)", strings.Title(strings.ToLower(comment.Association()))))
 	}
-	fmt.Fprint(&b, cs.Bold(fmt.Sprintf(" • %s", utils.FuzzyAgoAbbr(time.Now(), comment.Created()))))
+	fmt.Fprint(&b, cs.Boldf(" • %s", utils.FuzzyAgoAbbr(time.Now(), comment.Created())))
 	if comment.IsEdited() {
 		fmt.Fprint(&b, cs.Bold(" • Edited"))
 	}
diff --git a/pkg/cmd/pr/status/status.go b/pkg/cmd/pr/status/status.go
@@ -205,7 +205,7 @@ func printPrs(io *iostreams.IOStreams, totalCount int, prs ...api.PullRequest) {
 					if checks.Failing == checks.Total {
 						summary = cs.Red("× All checks failing")
 					} else {
-						summary = cs.Red(fmt.Sprintf("× %d/%d checks failing", checks.Failing, checks.Total))
+						summary = cs.Redf("× %d/%d checks failing", checks.Failing, checks.Total)
 					}
 				} else if checks.Pending > 0 {
 					summary = cs.Yellow("- Checks pending")
diff --git a/pkg/iostreams/color.go b/pkg/iostreams/color.go
@@ -63,27 +63,43 @@ func (c *ColorScheme) Bold(t string) string {
 	return bold(t)
 }
 
+func (c *ColorScheme) Boldf(t string, args ...interface{}) string {
+	return c.Bold(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) Red(t string) string {
 	if !c.enabled {
 		return t
 	}
 	return red(t)
 }
 
+func (c *ColorScheme) Redf(t string, args ...interface{}) string {
+	return c.Red(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) Yellow(t string) string {
 	if !c.enabled {
 		return t
 	}
 	return yellow(t)
 }
 
+func (c *ColorScheme) Yellowf(t string, args ...interface{}) string {
+	return c.Yellow(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) Green(t string) string {
 	if !c.enabled {
 		return t
 	}
 	return green(t)
 }
 
+func (c *ColorScheme) Greenf(t string, args ...interface{}) string {
+	return c.Green(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) Gray(t string) string {
 	if !c.enabled {
 		return t
@@ -105,6 +121,10 @@ func (c *ColorScheme) Magenta(t string) string {
 	return magenta(t)
 }
 
+func (c *ColorScheme) Magentaf(t string, args ...interface{}) string {
+	return c.Magenta(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) Cyan(t string) string {
 	if !c.enabled {
 		return t
@@ -130,6 +150,10 @@ func (c *ColorScheme) Blue(t string) string {
 	return blue(t)
 }
 
+func (c *ColorScheme) Bluef(t string, args ...interface{}) string {
+	return c.Blue(fmt.Sprintf(t, args...))
+}
+
 func (c *ColorScheme) SuccessIcon() string {
 	return c.SuccessIconWithColor(c.Green)
 }

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,9 @@ func formatComment(io *iostreams.IOStreams, comment Comment, newest bool) (strin`
`99`	`99`	`fmt.Fprint(&b, formatCommentStatus(cs, comment.Status()))`
`100`	`100`	`}`
`101`	`101`	`if comment.Association() != "NONE" {`
`102`		`- fmt.Fprint(&b, cs.Bold(fmt.Sprintf(" (%s)", strings.Title(strings.ToLower(comment.Association())))))`
	`102`	`+ fmt.Fprint(&b, cs.Boldf(" (%s)", strings.Title(strings.ToLower(comment.Association()))))`
`103`	`103`	`}`
`104`		`- fmt.Fprint(&b, cs.Bold(fmt.Sprintf(" • %s", utils.FuzzyAgoAbbr(time.Now(), comment.Created()))))`
	`104`	`+ fmt.Fprint(&b, cs.Boldf(" • %s", utils.FuzzyAgoAbbr(time.Now(), comment.Created())))`
`105`	`105`	`if comment.IsEdited() {`
`106`	`106`	`fmt.Fprint(&b, cs.Bold(" • Edited"))`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func printPrs(io *iostreams.IOStreams, totalCount int, prs ...api.PullRequest) {`
`205`	`205`	`if checks.Failing == checks.Total {`
`206`	`206`	`summary = cs.Red("× All checks failing")`
`207`	`207`	`} else {`
`208`		`- summary = cs.Red(fmt.Sprintf("× %d/%d checks failing", checks.Failing, checks.Total))`
	`208`	`+ summary = cs.Redf("× %d/%d checks failing", checks.Failing, checks.Total)`
`209`	`209`	`}`
`210`	`210`	`} else if checks.Pending > 0 {`
`211`	`211`	`summary = cs.Yellow("- Checks pending")`