Reverse order of issue lookup checks

samcoe · samcoe · commit b2edf782cf20 · 2020-12-08T14:16:40.000-05:00
diff --git a/pkg/cmd/issue/shared/lookup.go b/pkg/cmd/issue/shared/lookup.go
@@ -14,19 +14,19 @@ import (
 func IssueFromArg(apiClient *api.Client, baseRepoFn func() (ghrepo.Interface, error), arg string) (*api.Issue, ghrepo.Interface, error) {
 	issueNumber, baseRepo := issueMetadataFromURL(arg)
 
-	if baseRepo == nil {
+	if issueNumber == 0 {
 		var err error
-		baseRepo, err = baseRepoFn()
+		issueNumber, err = strconv.Atoi(strings.TrimPrefix(arg, "#"))
 		if err != nil {
-			return nil, nil, fmt.Errorf("could not determine base repo: %w", err)
+			return nil, nil, fmt.Errorf("invalid issue format: %q", arg)
 		}
 	}
 
-	if issueNumber == 0 {
+	if baseRepo == nil {
 		var err error
-		issueNumber, err = strconv.Atoi(strings.TrimPrefix(arg, "#"))
+		baseRepo, err = baseRepoFn()
 		if err != nil {
-			return nil, nil, fmt.Errorf("invalid issue format: %q", arg)
+			return nil, nil, fmt.Errorf("could not determine base repo: %w", err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -14,19 +14,19 @@ import (`
`14`	`14`	`func IssueFromArg(apiClient api.Client, baseRepoFn func() (ghrepo.Interface, error), arg string) (api.Issue, ghrepo.Interface, error) {`
`15`	`15`	`issueNumber, baseRepo := issueMetadataFromURL(arg)`
`16`	`16`
`17`		`- if baseRepo == nil {`
	`17`	`+ if issueNumber == 0 {`
`18`	`18`	`var err error`
`19`		`- baseRepo, err = baseRepoFn()`
	`19`	`+ issueNumber, err = strconv.Atoi(strings.TrimPrefix(arg, "#"))`
`20`	`20`	`if err != nil {`
`21`		`- return nil, nil, fmt.Errorf("could not determine base repo: %w", err)`
	`21`	`+ return nil, nil, fmt.Errorf("invalid issue format: %q", arg)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- if issueNumber == 0 {`
	`25`	`+ if baseRepo == nil {`
`26`	`26`	`var err error`
`27`		`- issueNumber, err = strconv.Atoi(strings.TrimPrefix(arg, "#"))`
	`27`	`+ baseRepo, err = baseRepoFn()`
`28`	`28`	`if err != nil {`
`29`		`- return nil, nil, fmt.Errorf("invalid issue format: %q", arg)`
	`29`	`+ return nil, nil, fmt.Errorf("could not determine base repo: %w", err)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`