Fix:(issue_1916) Add additional check for --

command.go

@@ -151,6 +151,8 @@ type Command struct {
 	didSetupDefaults bool
 	// whether in shell completion mode
 	shellCompletion bool
+	// run args
+	runArgs []string
 }
 
 // FullName returns the full name of the command.
@@ -184,6 +186,8 @@ func (cmd *Command) setupDefaults(osArgs []string) {
 
 	cmd.didSetupDefaults = true
 
+	cmd.runArgs = osArgs
+
 	isRoot := cmd.parent == nil
 	tracef("isRoot? %[1]v (cmd=%[2]q)", isRoot, cmd.Name)
 

completion_test.go

@@ -96,6 +96,14 @@ func TestCompletionSubcommand(t *testing.T) {
 		out.String(), "-g",
 		"Expected output to contain flag %[1]q", "-g",
 	)
+
+	out.Reset()
+
+	r.NoError(cmd.Run(buildTestContext(t), []string{"foo", "bar", "xyz", "--", "--generate-shell-completion"}))
+	r.Containsf(
+		out.String(), "-g",
+		"Expected output to contain flag %[1]q", "-g",
+	)
 }
 
 func TestCompletionInvalidShell(t *testing.T) {

help.go

@@ -237,6 +237,11 @@ func DefaultCompleteWithFlags(ctx context.Context, cmd *Command) {
 		lastArg = args[argsLen-1]
 	}
 
+	if len(cmd.runArgs) > 1 && cmd.runArgs[len(cmd.runArgs)-1] == "-" {
+		tracef("using last arg from cmd.runArgs [%v]", cmd.runArgs)
+		lastArg = "-"
+	}
+
 	if strings.HasPrefix(lastArg, "-") {
 		tracef("printing flag suggestion for flag[%v] on command %[1]q", lastArg, cmd.Name)
 		printFlagSuggestions(lastArg, cmd.Flags, cmd.Root().Writer)

parse.go

@@ -23,7 +23,7 @@ func parseIter(set *flag.FlagSet, ip iterativeParser, args []string, shellComple
 		err := set.Parse(args)
 		if !ip.useShortOptionHandling() || err == nil {
 			if shellComplete {
-				tracef("returning nil due to shellComplete=true")
+				tracef("returning nil due to shellComplete=true err=%v", err)
 
 				return nil
 			}