Merge remote-tracking branch 'origin/main' into michaeljs1990-add-flag-category-support

internal/build/build.go

@@ -63,10 +63,6 @@ func main() {
 			Name:   "gfmrun",
 			Action: GfmrunActionFunc,
 		},
-		{
-			Name:   "toc",
-			Action: TocActionFunc,
-		},
 		{
 			Name:   "check-binary-size",
 			Action: checkBinarySizeActionFunc,
@@ -216,15 +212,6 @@ func GfmrunActionFunc(c *cli.Context) error {
 	return runCmd("gfmrun", "-c", fmt.Sprint(counter), "-s", filename)
 }
 
-func TocActionFunc(c *cli.Context) error {
-	filename := c.Args().Get(0)
-	if filename == "" {
-		filename = "README.md"
-	}
-
-	return runCmd("markdown-toc", "-i", filename)
-}
-
 // checkBinarySizeActionFunc checks the size of an example binary to ensure that we are keeping size down
 // this was originally inspired by https://github.com/urfave/cli/issues/1055, and followed up on as a part
 // of https://github.com/urfave/cli/issues/1057

internal/genflags/generated.gotmpl

@@ -32,7 +32,7 @@ type {{.TypeName}} struct {
 func (f *{{.TypeName}}) String() string {
   return {{$.UrfaveCLINamespace}}FlagStringer(f)
 }
-{{end}}
+{{end}}{{/* /if .GenerateFmtStringerInterface */}}
 
 {{if .GenerateFlagInterface}}
 // IsSet returns whether or not the flag has been set through env or file
@@ -46,6 +46,20 @@ func (f *{{.TypeName}}) Names() []string {
 }
 
 {{end}}{{/* /if .GenerateFlagInterface */}}
+
+{{if .GenerateRequiredFlagInterface}}
+// IsRequired returns whether or not the flag is required
+func (f *{{.TypeName}}) IsRequired() bool {
+  return f.Required
+}
+{{end}}{{/* /if .GenerateRequiredFlagInterface */}}
+
+{{if .GenerateVisibleFlagInterface}}
+// IsVisible returns true if the flag is not hidden, otherwise false
+func (f *{{.TypeName}}) IsVisible() bool {
+	return !f.Hidden
+}
+{{end}}{{/* /if .GenerateVisibleFlagInterface */}}
 {{end}}{{/* /range .SortedFlagTypes */}}
 
 // vim{{/* 👻 */}}:ro

internal/genflags/generated_test.gotmpl

@@ -19,6 +19,22 @@ func Test{{.TypeName}}_SatisfiesFmtStringerInterface(t *testing.T) {
   _ = f.String()
 }
 {{end}}
+
+{{if .GenerateRequiredFlagInterface}}
+func Test{{.TypeName}}_SatisfiesRequiredFlagInterface(t *testing.T) {
+  var f {{$.UrfaveCLITestNamespace}}RequiredFlag = &{{$.UrfaveCLITestNamespace}}{{.TypeName}}{}
+
+  _ = f.IsRequired()
+}
+{{end}}
+
+{{if .GenerateVisibleFlagInterface}}
+func Test{{.TypeName}}_SatisfiesVisibleFlagInterface(t *testing.T) {
+  var f {{$.UrfaveCLITestNamespace}}VisibleFlag = &{{$.UrfaveCLITestNamespace}}{{.TypeName}}{}
+
+  _ = f.IsVisible()
+}
+{{end}}
 {{end}}
 
 // vim{{/* 👻 */}}:ro

internal/genflags/spec.go

@@ -83,6 +83,14 @@ func (ft *FlagType) GenerateFlagInterface() bool {
 	return ft.skipInterfaceNamed("Flag")
 }
 
+func (ft *FlagType) GenerateRequiredFlagInterface() bool {
+	return ft.skipInterfaceNamed("RequiredFlag")
+}
+
+func (ft *FlagType) GenerateVisibleFlagInterface() bool {
+	return ft.skipInterfaceNamed("VisibleFlag")
+}
+
 func (ft *FlagType) skipInterfaceNamed(name string) bool {
 	if ft.Config == nil {
 		return true