Merge pull request #2255 from dearchap/issue_2254

Fix:(issue_2254) Fix incorrect handling of arg after short option token

Author: dearchap

command_parse.go

@@ -207,6 +207,7 @@ func (cmd *Command) parseFlags(args Args) (Args, error) {
 						return &stringSliceArgs{posArgs}, fmt.Errorf("%s%s", argumentNotProvidedErrMsg, string(c))
 					}
 					flagVal = rargs[1]
+					rargs = rargs[1:]
 				}
 				tracef("parseFlags (flagName %[1]q) (flagVal %[2]q)", flagName, flagVal)
 				if err := cmd.set(flagName, sf, flagVal); err != nil {

command_test.go

@@ -1413,6 +1413,33 @@ func TestCommand_UseShortOptionAfterSliceFlag(t *testing.T) {
 	assert.Equal(t, expected, name)
 }
 
+func TestCommand_UseShortOptionWithArg(t *testing.T) {
+	var rootPath string
+	cmd := &Command{
+		UseShortOptionHandling: true,
+		Commands: []*Command{
+			{
+				Name:  "short",
+				Usage: "complete a task on the list",
+				Arguments: []Argument{
+					&StringArg{Name: "root", UsageText: "Root path", Destination: &rootPath},
+				},
+				Flags: []Flag{
+					&BoolFlag{Name: "serve", Aliases: []string{"s"}},
+					&BoolFlag{Name: "option", Aliases: []string{"o"}},
+					&StringFlag{Name: "message", Aliases: []string{"m"}},
+				},
+				Action: func(ctx context.Context, cmd *Command) error {
+					return nil
+				},
+			},
+		},
+	}
+	err := cmd.Run(buildTestContext(t), []string{"app", "short", "-som", "hello", "/path/to/root"})
+	require.NoError(t, err)
+	require.Equal(t, "/path/to/root", rootPath)
+}
+
 func TestCommand_Float64Flag(t *testing.T) {
 	var meters float64