Rename to SuccessIconWithColor

mislav · mislav · commit f46bab256ce4 · 2021-01-25T14:56:39.000+01:00
diff --git a/pkg/cmd/alias/delete/delete.go b/pkg/cmd/alias/delete/delete.go
@@ -63,7 +63,7 @@ func deleteRun(opts *DeleteOptions) error {
 
 	if opts.IO.IsStdoutTTY() {
 		cs := opts.IO.ColorScheme()
-		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted alias %s; was %s\n", cs.SuccessIconOfColor(cs.Red), opts.Name, expansion)
+		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted alias %s; was %s\n", cs.SuccessIconWithColor(cs.Red), opts.Name, expansion)
 	}
 
 	return nil
diff --git a/pkg/cmd/gist/create/create.go b/pkg/cmd/gist/create/create.go
@@ -140,7 +140,7 @@ func createRun(opts *CreateOptions) error {
 		return fmt.Errorf("%s Failed to create gist: %w", cs.Red("X"), err)
 	}
 
-	fmt.Fprintf(errOut, "%s %s\n", cs.SuccessIconOfColor(cs.Green), completionMessage)
+	fmt.Fprintf(errOut, "%s %s\n", cs.SuccessIconWithColor(cs.Green), completionMessage)
 
 	if opts.WebMode {
 		fmt.Fprintf(opts.IO.Out, "Opening %s in your browser.\n", utils.DisplayURL(gist.HTMLURL))
diff --git a/pkg/cmd/issue/close/close.go b/pkg/cmd/issue/close/close.go
@@ -75,7 +75,7 @@ func closeRun(opts *CloseOptions) error {
 		return err
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "%s Closed issue #%d (%s)\n", cs.SuccessIconOfColor(cs.Red), issue.Number, issue.Title)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Closed issue #%d (%s)\n", cs.SuccessIconWithColor(cs.Red), issue.Number, issue.Title)
 
 	return nil
 }
diff --git a/pkg/cmd/issue/reopen/reopen.go b/pkg/cmd/issue/reopen/reopen.go
@@ -75,7 +75,7 @@ func reopenRun(opts *ReopenOptions) error {
 		return err
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "%s Reopened issue #%d (%s)\n", cs.SuccessIconOfColor(cs.Green), issue.Number, issue.Title)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Reopened issue #%d (%s)\n", cs.SuccessIconWithColor(cs.Green), issue.Number, issue.Title)
 
 	return nil
 }
diff --git a/pkg/cmd/pr/close/close.go b/pkg/cmd/pr/close/close.go
@@ -86,7 +86,7 @@ func closeRun(opts *CloseOptions) error {
 		return fmt.Errorf("API call failed: %w", err)
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "%s Closed pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Red), pr.Number, pr.Title)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Closed pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Red), pr.Number, pr.Title)
 
 	crossRepoPR := pr.HeadRepositoryOwner.Login != baseRepo.RepoOwner()
 
@@ -132,7 +132,7 @@ func closeRun(opts *CloseOptions) error {
 				return err
 			}
 		}
-		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconOfColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)
+		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconWithColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)
 	}
 
 	return nil
diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go
@@ -180,7 +180,7 @@ func mergeRun(opts *MergeOptions) error {
 			case api.PullRequestMergeMethodSquash:
 				action = "Squashed and merged"
 			}
-			fmt.Fprintf(opts.IO.ErrOut, "%s %s pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Magenta), action, pr.Number, pr.Title)
+			fmt.Fprintf(opts.IO.ErrOut, "%s %s pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Magenta), action, pr.Number, pr.Title)
 		}
 	} else if !opts.IsDeleteBranchIndicated && opts.InteractiveMode && !crossRepoPR {
 		err := prompt.SurveyAskOne(&survey.Confirm{
@@ -243,7 +243,7 @@ func mergeRun(opts *MergeOptions) error {
 	}
 
 	if isTerminal {
-		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconOfColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)
+		fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconWithColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)
 	}
 
 	return nil
diff --git a/pkg/cmd/pr/ready/ready.go b/pkg/cmd/pr/ready/ready.go
@@ -88,7 +88,7 @@ func readyRun(opts *ReadyOptions) error {
 		return fmt.Errorf("API call failed: %w", err)
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "%s Pull request #%d is marked as \"ready for review\"\n", cs.SuccessIconOfColor(cs.Green), pr.Number)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Pull request #%d is marked as \"ready for review\"\n", cs.SuccessIconWithColor(cs.Green), pr.Number)
 
 	return nil
 }
diff --git a/pkg/cmd/pr/reopen/reopen.go b/pkg/cmd/pr/reopen/reopen.go
@@ -80,7 +80,7 @@ func reopenRun(opts *ReopenOptions) error {
 		return fmt.Errorf("API call failed: %w", err)
 	}
 
-	fmt.Fprintf(opts.IO.ErrOut, "%s Reopened pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Green), pr.Number, pr.Title)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Reopened pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Green), pr.Number, pr.Title)
 
 	return nil
 }
diff --git a/pkg/cmd/release/delete/delete.go b/pkg/cmd/release/delete/delete.go
@@ -92,7 +92,7 @@ func deleteRun(opts *DeleteOptions) error {
 	}
 
 	iofmt := opts.IO.ColorScheme()
-	fmt.Fprintf(opts.IO.ErrOut, "%s Deleted release %s\n", iofmt.SuccessIconOfColor(iofmt.Red), release.TagName)
+	fmt.Fprintf(opts.IO.ErrOut, "%s Deleted release %s\n", iofmt.SuccessIconWithColor(iofmt.Red), release.TagName)
 	if !release.IsDraft {
 		fmt.Fprintf(opts.IO.ErrOut, "%s Note that the %s git tag still remains in the repository\n", iofmt.WarningIcon(), release.TagName)
 	}
diff --git a/pkg/cmd/repo/create/create.go b/pkg/cmd/repo/create/create.go
@@ -249,7 +249,7 @@ func createRun(opts *CreateOptions) error {
 		isTTY := opts.IO.IsStdoutTTY()
 
 		if isTTY {
-			fmt.Fprintf(stderr, "%s Created repository %s on GitHub\n", cs.SuccessIconOfColor(cs.Green), ghrepo.FullName(repo))
+			fmt.Fprintf(stderr, "%s Created repository %s on GitHub\n", cs.SuccessIconWithColor(cs.Green), ghrepo.FullName(repo))
 		} else {
 			fmt.Fprintln(stdout, repo.URL)
 		}
diff --git a/pkg/cmd/repo/fork/fork.go b/pkg/cmd/repo/fork/fork.go
@@ -177,7 +177,7 @@ func forkRun(opts *ForkOptions) error {
 		}
 	} else {
 		if connectedToTerminal {
-			fmt.Fprintf(stderr, "%s Created fork %s\n", cs.SuccessIconOfColor(cs.Green), cs.Bold(ghrepo.FullName(forkedRepo)))
+			fmt.Fprintf(stderr, "%s Created fork %s\n", cs.SuccessIconWithColor(cs.Green), cs.Bold(ghrepo.FullName(forkedRepo)))
 		}
 	}
 
diff --git a/pkg/cmd/secret/remove/remove.go b/pkg/cmd/secret/remove/remove.go
@@ -85,7 +85,7 @@ func removeRun(opts *RemoveOptions) error {
 			target = ghrepo.FullName(baseRepo)
 		}
 		cs := opts.IO.ColorScheme()
-		fmt.Fprintf(opts.IO.Out, "%s Removed secret %s from %s\n", cs.SuccessIconOfColor(cs.Red), opts.SecretName, target)
+		fmt.Fprintf(opts.IO.Out, "%s Removed secret %s from %s\n", cs.SuccessIconWithColor(cs.Red), opts.SecretName, target)
 	}
 
 	return nil
diff --git a/pkg/cmd/secret/set/set.go b/pkg/cmd/secret/set/set.go
@@ -166,7 +166,7 @@ func setRun(opts *SetOptions) error {
 			target = ghrepo.FullName(baseRepo)
 		}
 		cs := opts.IO.ColorScheme()
-		fmt.Fprintf(opts.IO.Out, "%s Set secret %s for %s\n", cs.SuccessIconOfColor(cs.Green), opts.SecretName, target)
+		fmt.Fprintf(opts.IO.Out, "%s Set secret %s for %s\n", cs.SuccessIconWithColor(cs.Green), opts.SecretName, target)
 	}
 
 	return nil
diff --git a/pkg/iostreams/color.go b/pkg/iostreams/color.go
@@ -123,10 +123,10 @@ func (c *ColorScheme) Blue(t string) string {
 }
 
 func (c *ColorScheme) SuccessIcon() string {
-	return c.SuccessIconOfColor(c.Green)
+	return c.SuccessIconWithColor(c.Green)
 }
 
-func (c *ColorScheme) SuccessIconOfColor(colo func(string) string) string {
+func (c *ColorScheme) SuccessIconWithColor(colo func(string) string) string {
 	return colo("✓")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func deleteRun(opts *DeleteOptions) error {`
`63`	`63`
`64`	`64`	`if opts.IO.IsStdoutTTY() {`
`65`	`65`	`cs := opts.IO.ColorScheme()`
`66`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Deleted alias %s; was %s\n", cs.SuccessIconOfColor(cs.Red), opts.Name, expansion)`
	`66`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Deleted alias %s; was %s\n", cs.SuccessIconWithColor(cs.Red), opts.Name, expansion)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func createRun(opts *CreateOptions) error {`
`140`	`140`	`return fmt.Errorf("%s Failed to create gist: %w", cs.Red("X"), err)`
`141`	`141`	`}`
`142`	`142`
`143`		`- fmt.Fprintf(errOut, "%s %s\n", cs.SuccessIconOfColor(cs.Green), completionMessage)`
	`143`	`+ fmt.Fprintf(errOut, "%s %s\n", cs.SuccessIconWithColor(cs.Green), completionMessage)`
`144`	`144`
`145`	`145`	`if opts.WebMode {`
`146`	`146`	`fmt.Fprintf(opts.IO.Out, "Opening %s in your browser.\n", utils.DisplayURL(gist.HTMLURL))`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func closeRun(opts *CloseOptions) error {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`
`78`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Closed issue #%d (%s)\n", cs.SuccessIconOfColor(cs.Red), issue.Number, issue.Title)`
	`78`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Closed issue #%d (%s)\n", cs.SuccessIconWithColor(cs.Red), issue.Number, issue.Title)`
`79`	`79`
`80`	`80`	`return nil`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func reopenRun(opts *ReopenOptions) error {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`
`78`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Reopened issue #%d (%s)\n", cs.SuccessIconOfColor(cs.Green), issue.Number, issue.Title)`
	`78`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Reopened issue #%d (%s)\n", cs.SuccessIconWithColor(cs.Green), issue.Number, issue.Title)`
`79`	`79`
`80`	`80`	`return nil`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func closeRun(opts *CloseOptions) error {`
`86`	`86`	`return fmt.Errorf("API call failed: %w", err)`
`87`	`87`	`}`
`88`	`88`
`89`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Closed pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Red), pr.Number, pr.Title)`
	`89`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Closed pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Red), pr.Number, pr.Title)`
`90`	`90`
`91`	`91`	`crossRepoPR := pr.HeadRepositoryOwner.Login != baseRepo.RepoOwner()`
`92`	`92`
`@@ -132,7 +132,7 @@ func closeRun(opts *CloseOptions) error {`
`132`	`132`	`return err`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconOfColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)`
	`135`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconWithColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func mergeRun(opts *MergeOptions) error {`
`180`	`180`	`case api.PullRequestMergeMethodSquash:`
`181`	`181`	`action = "Squashed and merged"`
`182`	`182`	`}`
`183`		`- fmt.Fprintf(opts.IO.ErrOut, "%s %s pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Magenta), action, pr.Number, pr.Title)`
	`183`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s %s pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Magenta), action, pr.Number, pr.Title)`
`184`	`184`	`}`
`185`	`185`	`} else if !opts.IsDeleteBranchIndicated && opts.InteractiveMode && !crossRepoPR {`
`186`	`186`	`err := prompt.SurveyAskOne(&survey.Confirm{`
`@@ -243,7 +243,7 @@ func mergeRun(opts *MergeOptions) error {`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`if isTerminal {`
`246`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconOfColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)`
	`246`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Deleted branch %s%s\n", cs.SuccessIconWithColor(cs.Red), cs.Cyan(pr.HeadRefName), branchSwitchString)`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func readyRun(opts *ReadyOptions) error {`
`88`	`88`	`return fmt.Errorf("API call failed: %w", err)`
`89`	`89`	`}`
`90`	`90`
`91`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Pull request #%d is marked as \"ready for review\"\n", cs.SuccessIconOfColor(cs.Green), pr.Number)`
	`91`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Pull request #%d is marked as \"ready for review\"\n", cs.SuccessIconWithColor(cs.Green), pr.Number)`
`92`	`92`
`93`	`93`	`return nil`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func reopenRun(opts *ReopenOptions) error {`
`80`	`80`	`return fmt.Errorf("API call failed: %w", err)`
`81`	`81`	`}`
`82`	`82`
`83`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Reopened pull request #%d (%s)\n", cs.SuccessIconOfColor(cs.Green), pr.Number, pr.Title)`
	`83`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Reopened pull request #%d (%s)\n", cs.SuccessIconWithColor(cs.Green), pr.Number, pr.Title)`
`84`	`84`
`85`	`85`	`return nil`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func deleteRun(opts *DeleteOptions) error {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`iofmt := opts.IO.ColorScheme()`
`95`		`- fmt.Fprintf(opts.IO.ErrOut, "%s Deleted release %s\n", iofmt.SuccessIconOfColor(iofmt.Red), release.TagName)`
	`95`	`+ fmt.Fprintf(opts.IO.ErrOut, "%s Deleted release %s\n", iofmt.SuccessIconWithColor(iofmt.Red), release.TagName)`
`96`	`96`	`if !release.IsDraft {`
`97`	`97`	`fmt.Fprintf(opts.IO.ErrOut, "%s Note that the %s git tag still remains in the repository\n", iofmt.WarningIcon(), release.TagName)`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func createRun(opts *CreateOptions) error {`
`249`	`249`	`isTTY := opts.IO.IsStdoutTTY()`
`250`	`250`
`251`	`251`	`if isTTY {`
`252`		`- fmt.Fprintf(stderr, "%s Created repository %s on GitHub\n", cs.SuccessIconOfColor(cs.Green), ghrepo.FullName(repo))`
	`252`	`+ fmt.Fprintf(stderr, "%s Created repository %s on GitHub\n", cs.SuccessIconWithColor(cs.Green), ghrepo.FullName(repo))`
`253`	`253`	`} else {`
`254`	`254`	`fmt.Fprintln(stdout, repo.URL)`
`255`	`255`	`}`