From 3a87b13b01ac8628694f1e1b20bdb452cc0f54d2 Mon Sep 17 00:00:00 2001
From: Nico Windler <nico.windler@gmail.com>
Date: Sat, 10 Feb 2018 13:35:23 +0100
Subject: [PATCH] Fix args reordering when bool flags are present

---
 app_test.go | 33 +++++++++++++++++++++++++++++++++
 command.go  |  3 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app_test.go b/app_test.go
index 5db9882..42fb149 100644
--- a/app_test.go
+++ b/app_test.go
@@ -329,6 +329,39 @@ func TestApp_CommandWithArgBeforeFlags(t *testing.T) {
 	expect(t, firstArg, "my-arg")
 }
 
+func TestApp_CommandWithArgBeforeBoolFlags(t *testing.T) {
+	var parsedOption, parsedSecondOption, firstArg string
+	var parsedBool, parsedSecondBool bool
+
+	app := NewApp()
+	command := Command{
+		Name: "cmd",
+		Flags: []Flag{
+			StringFlag{Name: "option", Value: "", Usage: "some option"},
+			StringFlag{Name: "secondOption", Value: "", Usage: "another option"},
+			BoolFlag{Name: "boolflag", Usage: "some bool"},
+			BoolFlag{Name: "b", Usage: "another bool"},
+		},
+		Action: func(c *Context) error {
+			parsedOption = c.String("option")
+			parsedSecondOption = c.String("secondOption")
+			parsedBool = c.Bool("boolflag")
+			parsedSecondBool = c.Bool("b")
+			firstArg = c.Args().First()
+			return nil
+		},
+	}
+	app.Commands = []Command{command}
+
+	app.Run([]string{"", "cmd", "my-arg", "--boolflag", "--option", "my-option", "-b", "--secondOption", "fancy-option"})
+
+	expect(t, parsedOption, "my-option")
+	expect(t, parsedSecondOption, "fancy-option")
+	expect(t, parsedBool, true)
+	expect(t, parsedSecondBool, true)
+	expect(t, firstArg, "my-arg")
+}
+
 func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
 	var context *Context
 
diff --git a/command.go b/command.go
index ed4a81a..2acb976 100644
--- a/command.go
+++ b/command.go
@@ -213,11 +213,12 @@ func reorderArgs(args []string) []string {
 			break
 		}
 
-		if readFlagValue {
+		if readFlagValue && !strings.HasPrefix(arg, "-") && !strings.HasPrefix(arg, "--") {
 			readFlagValue = false
 			flags = append(flags, arg)
 			continue
 		}
+		readFlagValue = false
 
 		if arg != "-" && strings.HasPrefix(arg, "-") {
 			flags = append(flags, arg)