From 2be2bc755e4634d34136769a426a7ca52e698cc0 Mon Sep 17 00:00:00 2001
From: Yogesh Lonkar <lonkar.yogeshr@gmail.com>
Date: Mon, 5 Aug 2019 20:18:08 +0200
Subject: [PATCH] Add additional test for log flag completion and comments

---
 app_test.go | 29 +++++++++++++++++++++++++++++
 help.go     | 14 +++++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app_test.go b/app_test.go
index 6d5ccd0..3fc27b5 100644
--- a/app_test.go
+++ b/app_test.go
@@ -274,6 +274,35 @@ func ExampleApp_Run_bashComplete_withLongFlag() {
 	// --some-flag
 	// --similar-flag
 }
+func ExampleApp_Run_bashComplete_withMultipleLongFlag() {
+	os.Args = []string{"greet", "--st", "--generate-bash-completion"}
+
+	app := NewApp()
+	app.Name = "greet"
+	app.EnableBashCompletion = true
+	app.Flags = []Flag{
+		IntFlag{
+			Name: "int-flag,i",
+		},
+		StringFlag{
+			Name: "string,s",
+		},
+		StringFlag{
+			Name: "string-flag-2",
+		},
+		StringFlag{
+			Name: "similar-flag",
+		},
+		StringFlag{
+			Name: "some-flag",
+		},
+	}
+
+	app.Run(os.Args)
+	// Output:
+	// --string
+	// --string-flag-2
+}
 
 func ExampleApp_Run_bashComplete() {
 	// set args for examples sake
diff --git a/help.go b/help.go
index efc3889..d057a03 100644
--- a/help.go
+++ b/help.go
@@ -199,23 +199,27 @@ func cliArgContains(flagName string) bool {
 }
 
 func printFlagSuggestions(lastArg string, flags []Flag, writer io.Writer) {
-	cur := shortFlagRegex.ReplaceAllString(lastArg, "")
-	cur = shortFlagRegex.ReplaceAllString(cur, "")
+	cur := strings.TrimPrefix(lastArg, "-")
+	cur = strings.TrimPrefix(cur, "-")
 	for _, flag := range flags {
 		if bflag, ok := flag.(BoolFlag); ok && bflag.Hidden {
 			continue
 		}
 		for _, name := range strings.Split(flag.GetName(), ",") {
-			name = strings.Trim(name, " ")
+			name = strings.TrimSpace(name)
+			// this will get total count utf8 letters in flag name
 			count := utf8.RuneCountInString(name)
 			if count > 2 {
-				count = 2
+				count = 2 // resuse this count to generate single - or -- in flag completion
 			}
+			// if flag name has more than one utf8 letter and last argument in cli has -- prefix then
+			// skip flag completion for short flags example -v or -x
 			if strings.HasPrefix(lastArg, "--") && count == 1 {
 				continue
 			}
-			flagCompletion := fmt.Sprintf("%s%s", strings.Repeat("-", count), name)
+			// match if last argument matches this flag and it is not repeated
 			if strings.HasPrefix(name, cur) && cur != name && !cliArgContains(flag.GetName()) {
+				flagCompletion := fmt.Sprintf("%s%s", strings.Repeat("-", count), name)
 				fmt.Fprintln(writer, flagCompletion)
 			}
 		}