Add "open" qualifier when listing open issues/PRs (cli#1457)

ShubhankarKG · web-flow · commit bb6851c88b23 · 2020-07-31T18:22:08.000+02:00
diff --git a/command/issue.go b/command/issue.go
@@ -376,7 +376,7 @@ func listHeader(repoName string, itemName string, matchCount int, totalMatchCoun
 		return fmt.Sprintf("Showing %d of %s in %s that %s your search", matchCount, utils.Pluralize(totalMatchCount, itemName), repoName, matchVerb)
 	}
 
-	return fmt.Sprintf("Showing %d of %s in %s", matchCount, utils.Pluralize(totalMatchCount, itemName), repoName)
+	return fmt.Sprintf("Showing %d of %s in %s", matchCount, utils.Pluralize(totalMatchCount, fmt.Sprintf("open %s", itemName)), repoName)
 }
 
 func printRawIssuePreview(out io.Writer, issue *api.Issue) error {
diff --git a/command/issue_test.go b/command/issue_test.go
@@ -145,7 +145,7 @@ func TestIssueList_tty(t *testing.T) {
 	}
 
 	eq(t, output.Stderr(), `
-Showing 3 of 3 issues in OWNER/REPO
+Showing 3 of 3 open issues in OWNER/REPO
 
 `)
 
@@ -847,7 +847,7 @@ func Test_listHeader(t *testing.T) {
 				totalMatchCount: 23,
 				hasFilters:      false,
 			},
-			want: "Showing 1 of 23 genies in REPO",
+			want: "Showing 1 of 23 open genies in REPO",
 		},
 		{
 			name: "one result after filters",
@@ -869,7 +869,7 @@ func Test_listHeader(t *testing.T) {
 				totalMatchCount: 1,
 				hasFilters:      false,
 			},
-			want: "Showing 1 of 1 chip in REPO",
+			want: "Showing 1 of 1 open chip in REPO",
 		},
 		{
 			name: "one result in total after filters",
@@ -891,7 +891,7 @@ func Test_listHeader(t *testing.T) {
 				totalMatchCount: 23,
 				hasFilters:      false,
 			},
-			want: "Showing 4 of 23 plants in REPO",
+			want: "Showing 4 of 23 open plants in REPO",
 		},
 		{
 			name: "multiple results after filters",
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -307,7 +307,7 @@ func TestPRList(t *testing.T) {
 	}
 
 	assert.Equal(t, `
-Showing 3 of 3 pull requests in OWNER/REPO
+Showing 3 of 3 open pull requests in OWNER/REPO
 
 `, output.Stderr())
 
diff --git a/utils/utils.go b/utils/utils.go
@@ -48,9 +48,8 @@ func RenderMarkdown(text string) (string, error) {
 func Pluralize(num int, thing string) string {
 	if num == 1 {
 		return fmt.Sprintf("%d %s", num, thing)
-	} else {
-		return fmt.Sprintf("%d %ss", num, thing)
 	}
+	return fmt.Sprintf("%d %ss", num, thing)
 }
 
 func fmtDuration(amount int, unit string) string {

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ func listHeader(repoName string, itemName string, matchCount int, totalMatchCoun`
`376`	`376`	`return fmt.Sprintf("Showing %d of %s in %s that %s your search", matchCount, utils.Pluralize(totalMatchCount, itemName), repoName, matchVerb)`
`377`	`377`	`}`
`378`	`378`
`379`		`- return fmt.Sprintf("Showing %d of %s in %s", matchCount, utils.Pluralize(totalMatchCount, itemName), repoName)`
	`379`	`+ return fmt.Sprintf("Showing %d of %s in %s", matchCount, utils.Pluralize(totalMatchCount, fmt.Sprintf("open %s", itemName)), repoName)`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`func printRawIssuePreview(out io.Writer, issue *api.Issue) error {`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func TestPRList(t *testing.T) {`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	assert.Equal(t, `
`310`		`-Showing 3 of 3 pull requests in OWNER/REPO`
	`310`	`+Showing 3 of 3 open pull requests in OWNER/REPO`
`311`	`311`
`312`	`312`	`, output.Stderr())
`313`	`313`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,8 @@ func RenderMarkdown(text string) (string, error) {`
`48`	`48`	`func Pluralize(num int, thing string) string {`
`49`	`49`	`if num == 1 {`
`50`	`50`	`return fmt.Sprintf("%d %s", num, thing)`
`51`		`- } else {`
`52`		`- return fmt.Sprintf("%d %ss", num, thing)`
`53`	`51`	`}`
	`52`	`+ return fmt.Sprintf("%d %ss", num, thing)`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`func fmtDuration(amount int, unit string) string {`