fix for color fns, slightly generalize

vilmibm · vilmibm · commit 0ccdae1f87cb · 2020-11-04T13:01:04.000-08:00
diff --git a/pkg/cmd/root/help_reference.go b/pkg/cmd/root/help_reference.go
@@ -4,42 +4,33 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/cli/cli/pkg/iostreams"
 	"github.com/cli/cli/pkg/text"
-	"github.com/cli/cli/utils"
 	"github.com/spf13/cobra"
 )
 
-func ReferenceHelpTopic(command *cobra.Command) *cobra.Command {
-	reftext := fmt.Sprintf("%s reference\n\n", utils.Bold("gh"))
+func referenceHelpFn(cmd *cobra.Command, io *iostreams.IOStreams) func() string {
+	cs := io.ColorScheme()
+	return func() string {
+		reftext := fmt.Sprintf("%s reference\n\n", cs.Bold("gh"))
 
-	for _, c := range command.Commands() {
-		reftext += cmdRef(c, 0)
+		for _, c := range cmd.Commands() {
+			reftext += cmdRef(cs, c, 0)
+		}
+		return reftext
 	}
-
-	ref := &cobra.Command{
-		Use:    "reference",
-		Long:   reftext,
-		Hidden: true,
-		Args:   cobra.NoArgs,
-		Run:    helpTopicHelpFunc,
-	}
-
-	ref.SetHelpFunc(helpTopicHelpFunc)
-	ref.SetUsageFunc(helpTopicUsageFunc)
-
-	return ref
 }
 
-func cmdRef(cmd *cobra.Command, lvl int) string {
+func cmdRef(cs *iostreams.ColorScheme, cmd *cobra.Command, lvl int) string {
 	ref := ""
 
 	if cmd.Hidden {
 		return ref
 	}
 
-	cmdColor := utils.Bold
+	cmdColor := cs.Bold
 	if lvl > 0 {
-		cmdColor = utils.Cyan
+		cmdColor = cs.Cyan
 	}
 
 	// Name + Description
@@ -56,7 +47,7 @@ func cmdRef(cmd *cobra.Command, lvl int) string {
 	// Subcommands
 	subcommands := cmd.Commands()
 	for _, c := range subcommands {
-		ref += cmdRef(c, lvl+1)
+		ref += cmdRef(cs, c, lvl+1)
 	}
 
 	if len(subcommands) == 0 {
diff --git a/pkg/cmd/root/help_topic.go b/pkg/cmd/root/help_topic.go
@@ -47,6 +47,26 @@ var HelpTopics = map[string]map[string]string{
 	},
 }
 
+func NewHelpTopicFn(topic, short string, fn func() string) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:    topic,
+		Short:  short,
+		Long:   fn(),
+		Hidden: true,
+		Args:   cobra.NoArgs,
+		Run:    helpTopicHelpFunc,
+		Annotations: map[string]string{
+			"markdown:generate": "true",
+			"markdown:basename": "gh_help_" + topic,
+		},
+	}
+
+	cmd.SetHelpFunc(helpTopicHelpFunc)
+	cmd.SetUsageFunc(helpTopicUsageFunc)
+
+	return cmd
+}
+
 func NewHelpTopic(topic string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:    topic,
diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go
@@ -92,7 +92,8 @@ func NewCmdRoot(f *cmdutil.Factory, version, buildDate string) *cobra.Command {
 
 	// Help topics
 	cmd.AddCommand(NewHelpTopic("environment"))
-	cmd.AddCommand(ReferenceHelpTopic(cmd))
+	cmd.AddCommand(NewHelpTopicFn("reference", "Full reference for gh",
+		referenceHelpFn(cmd, f.IOStreams)))
 
 	cmdutil.DisableAuthCheck(cmd)
 
