From fdca340b28b0059101cf546a5e00b4b3b4e96890 Mon Sep 17 00:00:00 2001 From: bchadwic Date: Mon, 24 May 2021 12:53:17 -0700 Subject: [PATCH] simplified the if block for flags, now allows for checking destination before opening browser --- pkg/cmd/browse/browse.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/cmd/browse/browse.go b/pkg/cmd/browse/browse.go index ceac582e7..c562cba2a 100644 --- a/pkg/cmd/browse/browse.go +++ b/pkg/cmd/browse/browse.go @@ -86,21 +86,16 @@ func openInBrowser(cmd *cobra.Command, opts *BrowseOptions) { repoUrl := ghrepo.GenerateRepoURL(baseRepo, "") parseArgs(opts) - if opts.SelectorArg == "" { + if !hasArgs(opts) { // handle flags without args if opts.ProjectsFlag { repoUrl += "/projects" - printExit(exitSuccess, cmd, opts, repoUrl) } else if opts.SettingsFlag { repoUrl += "/settings" - printExit(exitSuccess, cmd, opts, repoUrl) } else if opts.WikiFlag { repoUrl += "/wiki" - printExit(exitSuccess, cmd, opts, repoUrl) - } else if getFlagAmount(cmd) == 0 { - printExit(exitSuccess, cmd, opts, repoUrl) } - opts.Browser.Browse(repoUrl) + printExit(exitSuccess, cmd, opts, repoUrl) return } @@ -144,6 +139,10 @@ func printExit(errorCode exitCode, cmd *cobra.Command, opts *BrowseOptions, url } +func hasArgs(opts *BrowseOptions) bool { + return opts.SelectorArg != "" +} + func getFlagAmount(cmd *cobra.Command) int { return cmd.Flags().NFlag() }