Merge pull request #1640 from dearchap/issue_1338

Fix:(issue_1338) Fix behaviour of skip flag parsing if there are subc…

command.go

@@ -98,8 +98,10 @@ type Commands []Command
 
 // Run invokes the command given the context, parses ctx.Args() to generate command-specific flags
 func (c Command) Run(ctx *Context) (err error) {
-	if len(c.Subcommands) > 0 {
-		return c.startApp(ctx)
+	if !c.SkipFlagParsing {
+		if len(c.Subcommands) > 0 {
+			return c.startApp(ctx)
+		}
 	}
 
 	if !c.HideHelp && (HelpFlag != BoolFlag{}) {
@@ -261,7 +263,7 @@ func reorderArgs(commandFlags []Flag, args []string) []string {
 
 // argIsFlag checks if an arg is one of our command flags
 func argIsFlag(commandFlags []Flag, arg string) bool {
-	if arg == "-" || arg == "--"{
+	if arg == "-" || arg == "--" {
 		// `-` is never a flag
 		// `--` is an option-value when following a flag, and a delimiter indicating the end of options in other cases.
 		return false

command_test.go

@@ -119,7 +119,7 @@ func TestParseAndRunHyphenValues(t *testing.T) {
 	cases := []struct {
 		testArgs     []string
 		expectedArgs []string
-		expectedOpt string
+		expectedOpt  string
 	}{
 		{[]string{"foo", "test", "argz"}, []string{"argz"}, ""},
 		{[]string{"foo", "test", "argz", "arga"}, []string{"argz", "arga"}, ""},
@@ -155,10 +155,10 @@ func TestParseAndRunHyphenValues(t *testing.T) {
 
 	for _, tc := range cases {
 		tc := tc
-		t.Run(strings.Join(tc.testArgs, "_"), func(t *testing.T){
+		t.Run(strings.Join(tc.testArgs, "_"), func(t *testing.T) {
 			var (
 				args []string
-				opt string
+				opt  string
 			)
 
 			cmd := Command{
@@ -171,8 +171,8 @@ func TestParseAndRunHyphenValues(t *testing.T) {
 					return nil
 				},
 				Flags: []Flag{
-					StringFlag{Name:  "opt"},
-					StringFlag{Name:  "opt2"},
+					StringFlag{Name: "opt"},
+					StringFlag{Name: "opt2"},
 				},
 			}
 
@@ -436,6 +436,11 @@ func TestCommandSkipFlagParsing(t *testing.T) {
 					Flags: []Flag{
 						StringFlag{Name: "flag"},
 					},
+					Subcommands: []Command{
+						{
+							Name: "some-arg",
+						},
+					},
 					Action: func(c *Context) {
 						fmt.Printf("%+v\n", c.String("flag"))
 						args = c.Args()