Merge pull request cli#540 from Dasio/goto-remove

mislav · web-flow · commit c60ccf9a16cf · 2020-02-24T21:46:53.000+01:00
Use break label instead of goto
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -497,7 +497,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]
       }
 	}`
 
-	prs := []PullRequest{}
+	var prs []PullRequest
 	pageLimit := min(limit, 100)
 	variables := map[string]interface{}{}
 
@@ -555,7 +555,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]
 			variables[name] = val
 		}
 	}
-
+loop:
 	for {
 		variables["limit"] = pageLimit
 		var data response
@@ -571,17 +571,16 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]
 		for _, edge := range prData.Edges {
 			prs = append(prs, edge.Node)
 			if len(prs) == limit {
-				goto done
+				break loop
 			}
 		}
 
 		if prData.PageInfo.HasNextPage {
 			variables["endCursor"] = prData.PageInfo.EndCursor
 			pageLimit = min(pageLimit, limit-len(prs))
-			continue
+		} else {
+			break
 		}
-	done:
-		break
 	}
 
 	return prs, nil

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]`
`497`	`497`	`}`
`498`	`498`	}`
`499`	`499`
`500`		`- prs := []PullRequest{}`
	`500`	`+ var prs []PullRequest`
`501`	`501`	`pageLimit := min(limit, 100)`
`502`	`502`	`variables := map[string]interface{}{}`
`503`	`503`
`@@ -555,7 +555,7 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]`
`555`	`555`	`variables[name] = val`
`556`	`556`	`}`
`557`	`557`	`}`
`558`		`-`
	`558`	`+loop:`
`559`	`559`	`for {`
`560`	`560`	`variables["limit"] = pageLimit`
`561`	`561`	`var data response`
`@@ -571,17 +571,16 @@ func PullRequestList(client *Client, vars map[string]interface{}, limit int) ([]`
`571`	`571`	`for _, edge := range prData.Edges {`
`572`	`572`	`prs = append(prs, edge.Node)`
`573`	`573`	`if len(prs) == limit {`
`574`		`- goto done`
	`574`	`+ break loop`
`575`	`575`	`}`
`576`	`576`	`}`
`577`	`577`
`578`	`578`	`if prData.PageInfo.HasNextPage {`
`579`	`579`	`variables["endCursor"] = prData.PageInfo.EndCursor`
`580`	`580`	`pageLimit = min(pageLimit, limit-len(prs))`
`581`		`- continue`
	`581`	`+ } else {`
	`582`	`+ break`
`582`	`583`	`}`
`583`		`- done:`
`584`		`- break`
`585`	`584`	`}`
`586`	`585`
`587`	`586`	`return prs, nil`