From 78048ea8113eb55a8b3938b7539a8fd911ac3976 Mon Sep 17 00:00:00 2001 From: umarcor Date: Mon, 1 Feb 2021 11:29:39 +0100 Subject: [PATCH] command/ValidateArgs: check ValidArgs regardless of Args being nil --- command.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/command.go b/command.go index 5befacae..c12c6c7c 100644 --- a/command.go +++ b/command.go @@ -1011,15 +1011,16 @@ func (c *Command) ExecuteC() (cmd *Command, err error) { return cmd, err } -// ValidateArgs returns an error if any positional args are not in -// the `ValidArgs` field of `Command` +// ValidateArgs returns an error if any positional args are not in the +// `ValidArgs` field of `Command`. Then, run the `Args` validator, if +// specified. func (c *Command) ValidateArgs(args []string) error { - if c.Args == nil { - return ArbitraryArgs(c, args) - } if err := validateArgs(c, args); err != nil { return err } + if c.Args == nil { + return ArbitraryArgs(c, args) + } return c.Args(c, args) }