From 20fb594370efc9933a56a8b42967712d4418b2bf Mon Sep 17 00:00:00 2001
From: Ramana Reddy <ramanaredy.manda@gmail.com>
Date: Thu, 15 Jun 2023 18:08:27 +0530
Subject: [PATCH 1/2] Add case sensitive support to flagset

---
 goflags.go      | 16 ++++++++++++----
 goflags_test.go | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/goflags.go b/goflags.go
index 215189f..d3e32f3 100644
--- a/goflags.go
+++ b/goflags.go
@@ -22,6 +22,7 @@ import (
 
 // FlagSet is a list of flags for an application
 type FlagSet struct {
+	CaseSensitive  bool
 	Marshal        bool
 	description    string
 	flagKeys       InsertionOrderedMap
@@ -536,7 +537,7 @@ func (flagSet *FlagSet) usageFunc() {
 			flagSet.displayGroupUsageFunc(newUniqueDeduper(), group, cliOutput, writer)
 			return
 		}
-		flag := flagSet.getFlagByName(strings.ToLower(os.Args[2]))
+		flag := flagSet.getFlagByName(os.Args[2])
 		if flag != nil {
 			flagSet.displaySingleFlagUsageFunc(os.Args[2], flag, cliOutput, writer)
 			return
@@ -562,9 +563,16 @@ func (flagSet *FlagSet) getGroupbyName(name string) groupData {
 func (flagSet *FlagSet) getFlagByName(name string) *FlagData {
 	var flagData *FlagData
 	flagSet.flagKeys.forEach(func(key string, data *FlagData) {
-		if strings.EqualFold(data.long, name) || strings.EqualFold(data.short, name) {
-			flagData = data
-			return
+		if flagSet.CaseSensitive {
+			if data.long == name || data.short == name {
+				flagData = data
+				return
+			}
+		} else {
+			if strings.EqualFold(data.long, name) || strings.EqualFold(data.short, name) {
+				flagData = data
+				return
+			}
 		}
 	})
 	return flagData
diff --git a/goflags_test.go b/goflags_test.go
index 7634aca..4d49764 100644
--- a/goflags_test.go
+++ b/goflags_test.go
@@ -365,6 +365,44 @@ func TestSetDefaultStringSliceValue(t *testing.T) {
 	tearDown(t.Name())
 }
 
+func TestCaseSensitiveFlagSet(t *testing.T) {
+	flagSet := NewFlagSet()
+	flagSet.CaseSensitive = true
+	var verbose, keyVal bool
+	flagSet.CreateGroup("Test", "Test",
+		flagSet.BoolVarP(&verbose, "verbose", "v", false, "show verbose output"),
+		flagSet.BoolVarP(&keyVal, "var", "V", false, "custom vars in key=value format"),
+	)
+	output := &bytes.Buffer{}
+	flagSet.CommandLine.SetOutput(output)
+
+	os.Args = []string{
+		os.Args[0],
+		"-h",
+		"V",
+	}
+	flagSet.usageFunc()
+
+	resultOutput := output.String()
+	actual := resultOutput[strings.Index(resultOutput, "Flags:\n"):]
+	expected := "Flags:\n   -V, -var  custom vars in key=value format\n"
+	assert.Equal(t, expected, actual)
+
+	output = &bytes.Buffer{}
+	flagSet.CommandLine.SetOutput(output)
+	os.Args = []string{
+		os.Args[0],
+		"-h",
+		"v",
+	}
+	flagSet.usageFunc()
+
+	resultOutput = output.String()
+	actual = resultOutput[strings.Index(resultOutput, "Flags:\n"):]
+	expected = "Flags:\n   -v, -verbose  show verbose output\n"
+	assert.Equal(t, expected, actual)
+}
+
 func tearDown(uniqueValue string) {
 	flag.CommandLine = flag.NewFlagSet(uniqueValue, flag.ContinueOnError)
 	flag.CommandLine.Usage = flag.Usage

From 8d74fff8e2a0072a1a8bf81704fbcd530d555a75 Mon Sep 17 00:00:00 2001
From: mzack <marco.rivoli.nvh@gmail.com>
Date: Thu, 15 Jun 2023 15:16:48 +0200
Subject: [PATCH 2/2] small code refactor

---
 goflags.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/goflags.go b/goflags.go
index d3e32f3..e1edeaa 100644
--- a/goflags.go
+++ b/goflags.go
@@ -563,16 +563,14 @@ func (flagSet *FlagSet) getGroupbyName(name string) groupData {
 func (flagSet *FlagSet) getFlagByName(name string) *FlagData {
 	var flagData *FlagData
 	flagSet.flagKeys.forEach(func(key string, data *FlagData) {
-		if flagSet.CaseSensitive {
-			if data.long == name || data.short == name {
-				flagData = data
-				return
-			}
-		} else {
-			if strings.EqualFold(data.long, name) || strings.EqualFold(data.short, name) {
-				flagData = data
-				return
-			}
+		// check if the items are equal
+		// - Case sensitive
+		equal := flagSet.CaseSensitive && (data.long == name || data.short == name)
+		// - Case insensitive
+		equalFold := !flagSet.CaseSensitive && (strings.EqualFold(data.long, name) || strings.EqualFold(data.short, name))
+		if equal || equalFold {
+			flagData = data
+			return
 		}
 	})
 	return flagData