Remove -- from arg slice

Author: dearchap

command_parse.go

@@ -84,7 +84,7 @@ func (cmd *Command) parseFlags(args Args) (Args, error) {
 
 		// stop parsing once we see a "--"
 		if firstArg == "--" {
-			posArgs = append(posArgs, rargs...)
+			posArgs = append(posArgs, rargs[1:]...)
 			return &stringSliceArgs{posArgs}, nil
 		}
 

command_test.go

@@ -946,8 +946,7 @@ func TestCommand_CommandWithFlagBeforeTerminator(t *testing.T) {
 
 	require.Equal(t, "my-option", parsedOption)
 	require.Equal(t, "my-arg", args.Get(0))
-	require.Equal(t, "--", args.Get(1))
-	require.Equal(t, "--notARealFlag", args.Get(2))
+	require.Equal(t, "--notARealFlag", args.Get(1))
 }
 
 func TestCommand_CommandWithDash(t *testing.T) {
@@ -990,8 +989,7 @@ func TestCommand_CommandWithNoFlagBeforeTerminator(t *testing.T) {
 
 	require.NotNil(t, args)
 	require.Equal(t, "my-arg", args.Get(0))
-	require.Equal(t, "--", args.Get(1))
-	require.Equal(t, "notAFlagAtAll", args.Get(2))
+	require.Equal(t, "notAFlagAtAll", args.Get(1))
 }
 
 func TestCommand_SkipFlagParsing(t *testing.T) {

completion_test.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"testing"
 
@@ -149,6 +150,7 @@ func TestCompletionSubcommand(t *testing.T) {
 								Name: "l1",
 							},
 						},
+						Action: func(ctx context.Context, c *Command) error { return nil },
 						Commands: []*Command{
 							{
 								Name: "xyz",
@@ -160,6 +162,7 @@ func TestCompletionSubcommand(t *testing.T) {
 										},
 									},
 								},
+								Action: func(ctx context.Context, c *Command) error { return nil },
 							},
 						},
 					},

help.go

@@ -89,9 +89,9 @@ func helpCommandAction(ctx context.Context, cmd *Command) error {
 	// Case 4. $ app help foo
 	// foo is the command for which help needs to be shown
 	if firstArg != "" {
-		if firstArg == "--" {
+		/*	if firstArg == "--" {
 			return nil
-		}
+		}*/
 		tracef("returning ShowCommandHelp with %[1]q", firstArg)
 		return ShowCommandHelp(ctx, cmd, firstArg)
 	}
@@ -243,7 +243,7 @@ func DefaultCompleteWithFlags(ctx context.Context, cmd *Command) {
 	}
 
 	if lastArg == "--" {
-		tracef("not printing flag suggestion as last arg is --")
+		tracef("No completions due to termination")
 		return
 	}
 

help_test.go

@@ -1291,7 +1291,7 @@ func TestDefaultCompleteWithFlags(t *testing.T) {
 					},
 				},
 			},
-			argv:     []string{"putz", "-e", completionFlag},
+			argv:     []string{"cmd", "putz", "-e", completionFlag},
 			env:      map[string]string{"SHELL": "zsh"},
 			expected: "--excitement:an exciting flag\n",
 		},
@@ -1311,7 +1311,7 @@ func TestDefaultCompleteWithFlags(t *testing.T) {
 					},
 				},
 			},
-			argv:     []string{"putz", "-e", completionFlag},
+			argv:     []string{"cmd", "putz", "-e", completionFlag},
 			env:      map[string]string{"SHELL": "zsh"},
 			expected: "--excitement\n",
 		},