Roll back the place of colorFuncForState

doi-t · doi-t · commit 4c2f15fe37e7 · 2020-04-02T23:58:28.000+09:00
diff --git a/command/issue.go b/command/issue.go
@@ -229,7 +229,7 @@ func issueView(cmd *cobra.Command, args []string) error {
 }
 
 func issueStateTitleWithColor(state string) string {
-	colorFunc := utils.ColorFuncForState(state)
+	colorFunc := colorFuncForState(state)
 	return colorFunc(strings.Title(strings.ToLower(state)))
 }
 
@@ -425,7 +425,7 @@ func printIssues(w io.Writer, prefix string, totalCount int, issues []api.Issue)
 		}
 		now := time.Now()
 		ago := now.Sub(issue.UpdatedAt)
-		table.AddField(issueNum, nil, utils.ColorFuncForState(issue.State))
+		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)
diff --git a/command/pr.go b/command/pr.go
@@ -238,7 +238,21 @@ func colorFuncForPR(pr api.PullRequest) func(string) string {
 	if pr.State == "OPEN" && pr.IsDraft {
 		return utils.Gray
 	}
-	return utils.ColorFuncForState(pr.State)
+	return colorFuncForState(pr.State)
+}
+
+// colorFuncForState returns a color function for a PR/Issue 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
+	}
 }
 
 func prView(cmd *cobra.Command, args []string) error {
diff --git a/utils/utils.go b/utils/utils.go
@@ -75,17 +75,3 @@ func Spinner(w io.Writer) *spinner.Spinner {
 	s.Writer = w
 	return s
 }
-
-// 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
`@@ -229,7 +229,7 @@ func issueView(cmd *cobra.Command, args []string) error {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`func issueStateTitleWithColor(state string) string {`
`232`		`- colorFunc := utils.ColorFuncForState(state)`
	`232`	`+ colorFunc := colorFuncForState(state)`
`233`	`233`	`return colorFunc(strings.Title(strings.ToLower(state)))`
`234`	`234`	`}`
`235`	`235`
`@@ -425,7 +425,7 @@ func printIssues(w io.Writer, prefix string, totalCount int, issues []api.Issue)`
`425`	`425`	`}`
`426`	`426`	`now := time.Now()`
`427`	`427`	`ago := now.Sub(issue.UpdatedAt)`
`428`		`- table.AddField(issueNum, nil, utils.ColorFuncForState(issue.State))`
	`428`	`+ table.AddField(issueNum, nil, colorFuncForState(issue.State))`
`429`	`429`	`table.AddField(replaceExcessiveWhitespace(issue.Title), nil, nil)`
`430`	`430`	`table.AddField(labels, nil, utils.Gray)`
`431`	`431`	`table.AddField(utils.FuzzyAgo(ago), nil, utils.Gray)`