Skip to content

Fixes for Tab Completion #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lexer747 merged 1 commit into from
Sep 7, 2025
Merged

Fixes for Tab Completion #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/subcommands/rawdata/rawdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func GetFlags() *Config {
f.Usage = func() {
w := flag.CommandLine.Output()
fmt.Fprintf(w, "Usage of %s: reads '.pings' files and outputs the raw data to the stdout\n"+
"\t data [-all][-csv] FILES\n\n"+
"e.g. %s my_ping_capture.ping\n", os.Args[0], os.Args[0])
"\t rawdata [-all][-csv] FILES\n\n"+
"e.g. %s rawdata my_ping_capture.ping\n", os.Args[0], os.Args[0])
f.PrintDefaults()
}
return ret
Expand Down
46 changes: 18 additions & 28 deletions cmd/tab_completion/tabflags/tabflags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"maps"
"slices"
"strings"
"sync"

"github.com/Lexer747/acci-ping/utils/iterutils"
)
Expand All @@ -32,7 +33,9 @@ type Flag struct {
type FlagSet struct {
*flag.FlagSet

nameToAc map[string]*AutoComplete
nameToAc map[string]*AutoComplete
o *sync.Once

fileExt string
flags []Flag
wantsFile bool
Expand All @@ -48,6 +51,7 @@ func NewAutoCompleteFlagSet(f *flag.FlagSet, wantsFile bool, fileExt string) *Fl
nameToAc: map[string]*AutoComplete{},
wantsFile: wantsFile,
fileExt: fileExt,
o: &sync.Once{},
}
}

Expand All @@ -64,6 +68,7 @@ func (f *FlagSet) FileExt() string {
// GetAutoCompleteFor returns the autocomplete configuration for the given CLI flag. Returns the nil if the
// param isn't found or not autocomplete config exists.
func (f *FlagSet) GetAutoCompleteFor(flagName string) *AutoComplete {
f.syncFlagSet()
ac, ok := f.nameToAc[strings.TrimPrefix(flagName, "-")]
if !ok {
return nil
Expand All @@ -74,6 +79,7 @@ func (f *FlagSet) GetAutoCompleteFor(flagName string) *AutoComplete {
// GetNames returns all the names that this flag set knows about, skipping "-debug" prefix unless
// [includeDebug] is true. Also skips any names in [toSkip].
func (f *FlagSet) GetNames(includeDebug bool, toSkip []string) []string {
f.syncFlagSet()
keys := maps.Keys(f.nameToAc)
withDash := iterutils.Map(keys, func(n string) string {
return "-" + n
Expand All @@ -90,6 +96,7 @@ func (f *FlagSet) GetNames(includeDebug bool, toSkip []string) []string {
}

func (f *FlagSet) Has(flagName string) bool {
f.syncFlagSet()
_, has := f.nameToAc[strings.TrimPrefix(flagName, "-")]
return has
}
Expand All @@ -103,33 +110,6 @@ func (f *FlagSet) String(name string, value string, usage string, ac AutoComplet
return ret
}

// Bool see [FlagSet.Bool]
//
// [FlagSet.Bool]: https://pkg.go.dev/flag#Bool
func (f *FlagSet) Bool(name string, value bool, usage string) *bool {
ret := f.FlagSet.Bool(name, value, usage)
f.addAc(name, nil)
return ret
}

// Bool see [FlagSet.Float64]
//
// [FlagSet.Float64]: https://pkg.go.dev/flag#Float64
func (f *FlagSet) Float64(name string, value float64, usage string) *float64 {
ret := f.FlagSet.Float64(name, value, usage)
f.addAc(name, nil)
return ret
}

// Bool see [FlagSet.Int]
//
// [FlagSet.Int]: https://pkg.go.dev/flag#Int
func (f *FlagSet) Int(name string, value int, usage string) *int {
ret := f.FlagSet.Int(name, value, usage)
f.addAc(name, nil)
return ret
}

func (f *FlagSet) addAc(name string, ac *AutoComplete) {
flag := Flag{
Name: name,
Expand All @@ -138,3 +118,13 @@ func (f *FlagSet) addAc(name string, ac *AutoComplete) {
f.flags = append(f.flags, flag)
f.nameToAc[name] = ac
}

func (f *FlagSet) syncFlagSet() {
f.o.Do(func() {
f.VisitAll(func(subFlag *flag.Flag) {
if _, alreadyRegistered := f.nameToAc[subFlag.Name]; !alreadyRegistered {
f.addAc(subFlag.Name, nil)
}
})
})
}
Loading