Rename to SuccessIconWithColor

This commit is contained in:
Mislav Marohnić 2021-01-25 14:56:39 +01:00
parent 96fa6e7830
commit f46bab256c
14 changed files with 17 additions and 17 deletions

View file

@ -63,7 +63,7 @@ func deleteRun(opts *DeleteOptions) error {
if opts.IO.IsStdoutTTY() { if opts.IO.IsStdoutTTY() {
cs := opts.IO.ColorScheme() 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 return nil

View file

@ -140,7 +140,7 @@ func createRun(opts *CreateOptions) error {
return fmt.Errorf("%s Failed to create gist: %w", cs.Red("X"), err) 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 { if opts.WebMode {
fmt.Fprintf(opts.IO.Out, "Opening %s in your browser.\n", utils.DisplayURL(gist.HTMLURL)) fmt.Fprintf(opts.IO.Out, "Opening %s in your browser.\n", utils.DisplayURL(gist.HTMLURL))

View file

@ -75,7 +75,7 @@ func closeRun(opts *CloseOptions) error {
return err 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 return nil
} }

View file

@ -75,7 +75,7 @@ func reopenRun(opts *ReopenOptions) error {
return err 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 return nil
} }

View file

@ -86,7 +86,7 @@ func closeRun(opts *CloseOptions) error {
return fmt.Errorf("API call failed: %w", err) 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() crossRepoPR := pr.HeadRepositoryOwner.Login != baseRepo.RepoOwner()
@ -132,7 +132,7 @@ func closeRun(opts *CloseOptions) error {
return err 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 return nil

View file

@ -180,7 +180,7 @@ func mergeRun(opts *MergeOptions) error {
case api.PullRequestMergeMethodSquash: case api.PullRequestMergeMethodSquash:
action = "Squashed and merged" 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 { } else if !opts.IsDeleteBranchIndicated && opts.InteractiveMode && !crossRepoPR {
err := prompt.SurveyAskOne(&survey.Confirm{ err := prompt.SurveyAskOne(&survey.Confirm{
@ -243,7 +243,7 @@ func mergeRun(opts *MergeOptions) error {
} }
if isTerminal { 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 return nil

View file

@ -88,7 +88,7 @@ func readyRun(opts *ReadyOptions) error {
return fmt.Errorf("API call failed: %w", err) 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 return nil
} }

View file

@ -80,7 +80,7 @@ func reopenRun(opts *ReopenOptions) error {
return fmt.Errorf("API call failed: %w", err) 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 return nil
} }

View file

@ -92,7 +92,7 @@ func deleteRun(opts *DeleteOptions) error {
} }
iofmt := opts.IO.ColorScheme() 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 { 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) fmt.Fprintf(opts.IO.ErrOut, "%s Note that the %s git tag still remains in the repository\n", iofmt.WarningIcon(), release.TagName)
} }

View file

@ -249,7 +249,7 @@ func createRun(opts *CreateOptions) error {
isTTY := opts.IO.IsStdoutTTY() isTTY := opts.IO.IsStdoutTTY()
if isTTY { 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 { } else {
fmt.Fprintln(stdout, repo.URL) fmt.Fprintln(stdout, repo.URL)
} }

View file

@ -177,7 +177,7 @@ func forkRun(opts *ForkOptions) error {
} }
} else { } else {
if connectedToTerminal { 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)))
} }
} }

View file

@ -85,7 +85,7 @@ func removeRun(opts *RemoveOptions) error {
target = ghrepo.FullName(baseRepo) target = ghrepo.FullName(baseRepo)
} }
cs := opts.IO.ColorScheme() 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 return nil

View file

@ -166,7 +166,7 @@ func setRun(opts *SetOptions) error {
target = ghrepo.FullName(baseRepo) target = ghrepo.FullName(baseRepo)
} }
cs := opts.IO.ColorScheme() 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 return nil

View file

@ -123,10 +123,10 @@ func (c *ColorScheme) Blue(t string) string {
} }
func (c *ColorScheme) SuccessIcon() 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("✓") return colo("✓")
} }