Move colorFuncForState for a PR/issue state to the utils package

doi-t · doi-t · commit faa4bed67abd · 2020-03-16T02:32:11.000+09:00
diff --git a/command/issue.go b/command/issue.go
@@ -148,7 +148,7 @@ func issueList(cmd *cobra.Command, args []string) error {
 		if labels != "" && table.IsTTY() {
 			labels = fmt.Sprintf("(%s)", labels)
 		}
-		table.AddField(issueNum, nil, colorFuncForState(issue.State))
+		table.AddField(issueNum, nil, utils.ColorFuncForState(issue.State))
 		table.AddField(replaceExcessiveWhitespace(issue.Title), nil, nil)
 		table.AddField(labels, nil, utils.Gray)
 		table.EndRow()
diff --git a/command/pr.go b/command/pr.go
@@ -232,20 +232,7 @@ func colorFuncForPR(pr api.PullRequest) func(string) string {
 	if pr.State == "OPEN" && pr.IsDraft {
 		return utils.Gray
 	} else {
-		return colorFuncForState(pr.State)
-	}
-}
-
-func colorFuncForState(state string) func(string) string {
-	switch state {
-	case "OPEN":
-		return utils.Green
-	case "CLOSED":
-		return utils.Red
-	case "MERGED":
-		return utils.Magenta
-	default:
-		return nil
+		return utils.ColorFuncForState(pr.State)
 	}
 }
 
diff --git a/utils/utils.go b/utils/utils.go
@@ -57,3 +57,17 @@ func FuzzyAgo(ago time.Duration) string {
 func Spinner() *spinner.Spinner {
 	return spinner.New(spinner.CharSets[11], 400*time.Millisecond)
 }
+
+// ColorFuncForState returns a color function for a PR/Issue state
+func ColorFuncForState(state string) func(string) string {
+	switch state {
+	case "OPEN":
+		return Green
+	case "CLOSED":
+		return Red
+	case "MERGED":
+		return Magenta
+	default:
+		return nil
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func issueList(cmd *cobra.Command, args []string) error {`
`148`	`148`	`if labels != "" && table.IsTTY() {`
`149`	`149`	`labels = fmt.Sprintf("(%s)", labels)`
`150`	`150`	`}`
`151`		`- table.AddField(issueNum, nil, colorFuncForState(issue.State))`
	`151`	`+ table.AddField(issueNum, nil, utils.ColorFuncForState(issue.State))`
`152`	`152`	`table.AddField(replaceExcessiveWhitespace(issue.Title), nil, nil)`
`153`	`153`	`table.AddField(labels, nil, utils.Gray)`
`154`	`154`	`table.EndRow()`