Skip to content

fix longopt matching for non-ambiguous shared prefixes #3

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
jonathonwebb merged 1 commit into from
Jan 22, 2025
Merged

fix longopt matching for non-ambiguous shared prefixes #3

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
7 changes: 7 additions & 0 deletions getopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,9 @@ func findLongOpt(name string, overrideOpt bool, c Config) (longOpt LongOpt, foun
matched := []LongOpt{}

for _, lo := range c.LongOpts {
if lo.Name == name {
return lo, true
}
if strings.HasPrefix(lo.Name, name) {
matched = append(matched, lo)
}
Expand All @@ -398,5 +401,9 @@ func findLongOpt(name string, overrideOpt bool, c Config) (longOpt LongOpt, foun
return matched[0], true
}

if len(matched) > 0 && c.Func != FuncGetOptLongOnly {
return matched[0], true
}

return longOpt, false
}
5 changes: 4 additions & 1 deletion testdata/cases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@
{ "label": "long_only_with_short", "args": ["prgm", "-a", "-alonga", "-ba1", "-blongb=a2", "-c", "-clongc"], "opts": "ab:c::", "lopts": "alonga,blongb:,clongc::"},
{ "label": "long_only_with_short_abbr", "args": ["prgm", "-a", "-al", "-ba1", "-bl=a2", "-c", "-cl"], "opts": "ab:c::l", "lopts": "alonga,blongb:,clongc::"},
{ "label": "permute_and_terminate", "args": ["prgm", "p1", "-a", "p2", "p3", "-ba1", "-c", "p4", "--longa", "p5", "p6", "p7", "--longb", "a2", "--", "--longc"], "opts": "ab:c::", "lopts": "longa,longb:,longc::"},
{ "label": "kitchen_sink", "args": ["prgm", "p1", "-a", "-longa", "p2", "p3", "-ba1", "p4", "--longb=a2", "-ca3", "--longc", "--", "-a"], "opts": "ab:c::", "lopts": "longa,longb:,longc::"}
{ "label": "kitchen_sink", "args": ["prgm", "p1", "-a", "-longa", "p2", "p3", "-ba1", "p4", "--longb=a2", "-ca3", "--longc", "--", "-a"], "opts": "ab:c::", "lopts": "longa,longb:,longc::"},
{ "label": "ambiguous_req_arg", "args": ["prgm", "--long-a=a", "--long-ab=b", "--long=c"], "opts": "", "lopts": "long-a:,long-ab:"},
{ "label": "ambiguous_opt_arg", "args": ["prgm", "--long-a=a", "--long-ab=b", "--long=c"], "opts": "", "lopts": "long-a::,long-ab::"},
{ "label": "ambiguous_no_arg", "args": ["prgm", "--long-a", "--long-ab", "--long"], "opts": "", "lopts": "long-a,long-ab"}
]
Loading
Loading