Merge pull request urfave#2296 from idelchi/issue_2292

Fix:(issue_2292) Empty positional args no longer break parse loop

Author: dearchap

command_parse.go

@@ -80,7 +80,8 @@ func (cmd *Command) parseFlags(args Args) (Args, error) {
 
 		firstArg := strings.TrimSpace(rargs[0])
 		if len(firstArg) == 0 {
-			break
+			posArgs = append(posArgs, rargs[0])
+			continue
 		}
 
 		// stop parsing once we see a "--"

command_test.go

@@ -823,7 +823,7 @@ var defaultCommandTests = []struct {
 	{"f", "", nil, true},
 	{"", "foobar", nil, true},
 	{"", "", nil, true},
-	{" ", "", nil, true},
+	{" ", "", nil, false},
 	{"bat", "batbaz", nil, true},
 	{"nothing", "batbaz", nil, true},
 	{"nothing", "", nil, false},
@@ -911,10 +911,10 @@ var defaultCommandSubCommandTests = []struct {
 	{"", "carly", "foobar", true},
 	{"", "jimmers", "foobar", false},
 	{"", "jimmers", "", false},
-	{" ", "jimmers", "foobar", true},
+	{" ", "jimmers", "foobar", false},
 	{"", "", "", true},
-	{" ", "", "", true},
-	{" ", "j", "", true},
+	{" ", "", "", false},
+	{" ", "j", "", false},
 	{"bat", "", "batbaz", false},
 	{"nothing", "", "batbaz", false},
 	{"nothing", "", "", false},
@@ -977,10 +977,10 @@ var defaultCommandFlagTests = []struct {
 	{"", "--carly=derp", "foobar", true},
 	{"", "-j", "foobar", true},
 	{"", "-j", "", true},
-	{" ", "-j", "foobar", true},
+	{" ", "-j", "foobar", false},
 	{"", "", "", true},
-	{" ", "", "", true},
-	{" ", "-j", "", true},
+	{" ", "", "", false},
+	{" ", "-j", "", false},
 	{"bat", "", "batbaz", false},
 	{"nothing", "", "batbaz", false},
 	{"nothing", "", "", false},
@@ -5624,6 +5624,47 @@ func TestCommand_ExclusiveFlagsPersistent(t *testing.T) {
 	}
 }
 
+func TestEmptyPositionalArgs(t *testing.T) {
+	testCases := []struct {
+		Name     string
+		Args     []string
+		Expected []string
+	}{
+		{
+			Name:     "empty arg between values",
+			Args:     []string{"app", "hello", "", "world"},
+			Expected: []string{"hello", "", "world"},
+		},
+		{
+			Name:     "empty arg at start",
+			Args:     []string{"app", "", "hello"},
+			Expected: []string{"", "hello"},
+		},
+		{
+			Name:     "whitespace-only arg",
+			Args:     []string{"app", "hello", "  ", "world"},
+			Expected: []string{"hello", "  ", "world"},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.Name, func(t *testing.T) {
+			var args []string
+
+			cmd := &Command{
+				Action: func(_ context.Context, cmd *Command) error {
+					args = cmd.Args().Slice()
+					return nil
+				},
+			}
+
+			err := cmd.Run(buildTestContext(t), tc.Args)
+			assert.NoError(t, err)
+			assert.Equal(t, tc.Expected, args)
+		})
+	}
+}
+
 func TestFlagEqualsEmptyValue(t *testing.T) {
 	t.Run("--flag= sets empty string", func(t *testing.T) {
 		var val string