From 9971c12bed5d1888d85b311b3fff42bae9dfc336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav@github.com>
Date: Wed, 9 Nov 2022 21:55:39 +0100
Subject: [PATCH] Group issue commands into general vs. additional

---
 pkg/cmd/issue/create/create.go | 1 +
 pkg/cmd/issue/issue.go         | 5 +++++
 pkg/cmd/issue/list/list.go     | 1 +
 pkg/cmd/issue/status/status.go | 7 ++++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/cmd/issue/create/create.go b/pkg/cmd/issue/create/create.go
index c6f057388..4225ab38c 100644
--- a/pkg/cmd/issue/create/create.go
+++ b/pkg/cmd/issue/create/create.go
@@ -63,6 +63,7 @@ func NewCmdCreate(f *cmdutil.Factory, runF func(*CreateOptions) error) *cobra.Co
 		`),
 		Args:    cmdutil.NoArgsQuoteReminder,
 		Aliases: []string{"new"},
+		GroupID: "general",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// support `-R, --repo` override
 			opts.BaseRepo = f.BaseRepo
diff --git a/pkg/cmd/issue/issue.go b/pkg/cmd/issue/issue.go
index 8847bf3bf..0186be028 100644
--- a/pkg/cmd/issue/issue.go
+++ b/pkg/cmd/issue/issue.go
@@ -41,6 +41,11 @@ func NewCmdIssue(f *cmdutil.Factory) *cobra.Command {
 
 	cmdutil.EnableRepoOverride(cmd, f)
 
+	cmd.AddGroup(&cobra.Group{
+		ID:    "general",
+		Title: "General commands",
+	})
+
 	cmd.AddCommand(cmdClose.NewCmdClose(f, nil))
 	cmd.AddCommand(cmdCreate.NewCmdCreate(f, nil))
 	cmd.AddCommand(cmdList.NewCmdList(f, nil))
diff --git a/pkg/cmd/issue/list/list.go b/pkg/cmd/issue/list/list.go
index 71ed5ed0f..e6372dc87 100644
--- a/pkg/cmd/issue/list/list.go
+++ b/pkg/cmd/issue/list/list.go
@@ -73,6 +73,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
 			$ gh issue list --search "error no:assignee sort:created-asc"
 		`),
 		Aliases: []string{"ls"},
+		GroupID: "general",
 		Args:    cmdutil.NoArgsQuoteReminder,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// support `-R, --repo` override
diff --git a/pkg/cmd/issue/status/status.go b/pkg/cmd/issue/status/status.go
index c9db94c98..532982e1c 100644
--- a/pkg/cmd/issue/status/status.go
+++ b/pkg/cmd/issue/status/status.go
@@ -32,9 +32,10 @@ func NewCmdStatus(f *cmdutil.Factory, runF func(*StatusOptions) error) *cobra.Co
 	}
 
 	cmd := &cobra.Command{
-		Use:   "status",
-		Short: "Show status of relevant issues",
-		Args:  cmdutil.NoArgsQuoteReminder,
+		Use:     "status",
+		Short:   "Show status of relevant issues",
+		GroupID: "general",
+		Args:    cmdutil.NoArgsQuoteReminder,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// support `-R, --repo` override
 			opts.BaseRepo = f.BaseRepo