set cmd.Action to default ShowCommandHelp when nil (#1308)

Author: burmudar

cmd/src/abc.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"context"
-
 	"github.com/sourcegraph/src-cli/internal/clicompat"
 	"github.com/urfave/cli/v3"
 )
@@ -18,12 +16,6 @@ var abcCommand = clicompat.Wrap(&cli.Command{
 				abcVariablesSetCommand,
 				abcVariablesDeleteCommand,
 			},
-			Action: func(ctx context.Context, cmd *cli.Command) error {
-				return cli.ShowSubcommandHelp(cmd)
-			},
 		}),
 	},
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		return cli.ShowSubcommandHelp(cmd)
-	},
 })

cmd/src/auth.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"context"
-
 	"github.com/sourcegraph/src-cli/internal/clicompat"
 	"github.com/urfave/cli/v3"
 )
@@ -32,7 +30,4 @@ var authCommand = clicompat.Wrap(&cli.Command{
 	Commands: []*cli.Command{
 		authTokenCommand,
 	},
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		return cli.ShowSubcommandHelp(cmd)
-	},
 })

internal/clicompat/help.go

@@ -16,15 +16,17 @@ func Wrap(cmd *cli.Command) *cli.Command {
 	}
 
 	cmd.OnUsageError = OnUsageError
-	cmd.Action = wrapWithHelpOnUsageError(cmd.Action)
+	if cmd.Action == nil {
+		cmd.Action = func(ctx context.Context, cmd *cli.Command) error {
+			return cli.ShowSubcommandHelp(cmd)
+		}
+	} else {
+		cmd.Action = wrapWithHelpOnUsageError(cmd.Action)
+	}
 	return cmd
 }
 
 func wrapWithHelpOnUsageError(action cli.ActionFunc) cli.ActionFunc {
-	if action == nil {
-		return nil
-	}
-
 	return func(ctx context.Context, cmd *cli.Command) error {
 		err := action(ctx, cmd)
 		if err != nil && errors.HasType[*cmderrors.UsageError](err) {