glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-04-27 17:17:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Address comments

Browse source 
Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com>
This commit is contained in:
Marc Khouzam 2024-12-28 17:25:02 -05:00
parent 65d3afe0bf
commit 8c1b26b9f4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
completions.go
View file

@ -270,10 +270,10 @@ func (c *Command) initCompleteCmd(args []string) {
} }
} }
// sliceValue is a reduced version of [pflag.SliceValue]. It is used to detect // SliceValue is a reduced version of [pflag.SliceValue]. It is used to detect
// flags that accept multiple values and therefore can provide completion // flags that accept multiple values and therefore can provide completion
// multiple times. // multiple times.
type sliceValue interface { type SliceValue interface {
// GetSlice returns the flag value list as an array of strings. // GetSlice returns the flag value list as an array of strings.
GetSlice() []string GetSlice() []string
} }
@ -407,13 +407,13 @@ func (c *Command) getCompletions(args []string) (*Command, []string, ShellCompDi
// If we have not found any required flags, only then can we show regular flags // If we have not found any required flags, only then can we show regular flags
if len(completions) == 0 { if len(completions) == 0 {
doCompleteFlags := func(flag *pflag.Flag) { doCompleteFlags := func(flag *pflag.Flag) {
_, acceptsMultiple := flag.Value.(sliceValue) _, acceptsMultiple := flag.Value.(SliceValue)
acceptsMultiple = acceptsMultiple ||
if !flag.Changed ||
acceptsMultiple ||
strings.Contains(flag.Value.Type(), "Slice") || strings.Contains(flag.Value.Type(), "Slice") ||
strings.Contains(flag.Value.Type(), "Array") || strings.Contains(flag.Value.Type(), "Array") ||
strings.HasPrefix(flag.Value.Type(), "stringTo") { strings.HasPrefix(flag.Value.Type(), "stringTo")
if !flag.Changed || acceptsMultiple {
// If the flag is not already present, or if it can be specified multiple times (Array, Slice, or stringTo) // If the flag is not already present, or if it can be specified multiple times (Array, Slice, or stringTo)
// we suggest it as a completion // we suggest it as a completion
completions = append(completions, getFlagNameCompletions(flag, toComplete)...) completions = append(completions, getFlagNameCompletions(flag, toComplete)...)

2
completions_test.go
View file

@ -675,7 +675,7 @@ func TestFlagNameCompletionInGoWithDesc(t *testing.T) {
// but does not include "Slice" or "Array" in its "Type" string. // but does not include "Slice" or "Array" in its "Type" string.
type customMultiString []string type customMultiString []string
var _ sliceValue = (*customMultiString)(nil) var _ SliceValue = (*customMultiString)(nil)
func (s *customMultiString) String() string { func (s *customMultiString) String() string {
return fmt.Sprintf("%v", *s) return fmt.Sprintf("%v", *s)