diff --git a/pkg/cmd/alias/delete/delete.go b/pkg/cmd/alias/delete/delete.go index c92745545..f8ee065c4 100644 --- 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 index 13bf8be7d..fe6fac748 100644 --- 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 index 8e5644d61..0a5355c21 100644 --- 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 index 1d6e39565..b0bb784f3 100644 --- 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 index 8fc35336c..f4cc442c2 100644 --- 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 index 9746395f7..6626c3bc1 100644 --- 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 index b1df2c992..003902963 100644 --- 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 index 8614ce330..135e341fa 100644 --- 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 index 4568ace17..fde3fbcee 100644 --- 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 index 575ba7c05..bccd6f9a4 100644 --- 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 index 848103d25..e10e45431 100644 --- 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 index febf13be1..55ab08a67 100644 --- 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 index 89344ecb9..4c4c20908 100644 --- 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 index b5071c68a..46cfc3a3c 100644 --- 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("✓") }