Skip to content

Allow long flag with equal sign but no args (--foo= --bar=x) #141

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

Closed
tgulacsi wants to merge 1 commit into from
Closed

Allow long flag with equal sign but no args (--foo= --bar=x) #141

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
8 changes: 5 additions & 3 deletions flag_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,14 @@ func (fs *FlagSet) parseShortFlag(arg string, args []string) ([]string, error) {

func (fs *FlagSet) parseLongFlag(arg string, args []string) ([]string, error) {
var (
name string
value string
name string
value string
hasEqualSign bool
)

if equals := strings.IndexRune(arg, '='); equals > 0 {
arg, value = arg[:equals], arg[equals+1:]
hasEqualSign = true
}

name = strings.TrimPrefix(arg, "--")
Expand All @@ -264,7 +266,7 @@ func (fs *FlagSet) parseLongFlag(arg string, args []string) ([]string, error) {
}
}

if value == "" {
if value == "" && (f.isBoolFlag || !hasEqualSign) {
switch {
case f.isBoolFlag:
value = "true" // `-b` or `--foo` default to true
Expand Down
14 changes: 11 additions & 3 deletions flag_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ func TestFlagSet_Basics(t *testing.T) {
"-b -d250ms",
"-bd250ms",
"--duration 250ms --string=nondefault",
"--empty-string=",
} {
t.Run(argstr, func(t *testing.T) {
fs := ff.NewFlagSet("myset")
fs.Bool('b', "boolean", "boolean flag")
fs.StringLong("string", "default", "string flag")
fs.Duration('d', "duration", 250*time.Millisecond, "duration flag")
fs.StringLong("empty-string", "", "empty string")
fftest.ValidateFlags(t, fs, strings.Fields(argstr))
})
}
Expand Down Expand Up @@ -70,6 +72,7 @@ func TestFlagSet_Bool(t *testing.T) {
}{
{args: []string{"--xflag"}, wantX: true, wantY: true},
{args: []string{"--xflag=true"}, wantX: true, wantY: true},
{args: []string{"--xflag="}, wantX: true, wantY: true},
{args: []string{"--xflag", "true"}, wantX: true, wantY: true},
{args: []string{"-x=true"}, wantX: false, wantY: true, wantErr: ff.ErrUnknownFlag}, // = interpreted as flag
{args: []string{"-x"}, wantX: true, wantY: true},
Expand Down Expand Up @@ -122,6 +125,7 @@ func TestStdFlags_Bool(t *testing.T) {
}{
{args: []string{"-xflag"}, wantX: true, wantY: true},
{args: []string{"-xflag=true"}, wantX: true, wantY: true},
{args: []string{"-xflag="}, wantX: true, wantY: true},
{args: []string{"-xflag", "true"}, wantX: true, wantY: true},
{args: []string{"--xflag", "true"}, wantX: true, wantY: true},
{args: []string{"--xflag=true"}, wantX: true, wantY: true},
Expand Down Expand Up @@ -348,6 +352,10 @@ func TestFlagSet_structs(t *testing.T) {
args: "--alpha=x",
want: myFlags{Alpha: "x", Iota: 0.43},
},
{
args: "--alpha=",
want: myFlags{Alpha: "", Iota: 0.43},
},
{
args: "-e --iota=1.23",
want: myFlags{Alpha: "alpha-default", Epsilon: true, Iota: 1.23},
Expand Down Expand Up @@ -417,11 +425,11 @@ func TestFlagSet_structs(t *testing.T) {
t.Fatalf("AddStruct: %v", err)
}

if err := ff.Parse(fs, []string{"--foo=a", "--foo", "b"}); err != nil {
if err := ff.Parse(fs, []string{"--foo=a", "--foo", "b", "--foo="}); err != nil {
t.Fatalf("Parse: %v", err)
}

if want, have := []string{"a", "b"}, flags.Foo.Get(); !reflect.DeepEqual(want, have) {
if want, have := []string{"a", "b", ""}, flags.Foo.Get(); !reflect.DeepEqual(want, have) {
t.Errorf("foo: want %#+v, have %#+v", want, have)
}
})
Expand Down Expand Up @@ -494,7 +502,7 @@ func TestFlagSet_StructIgnoreReset(t *testing.T) {
}

{
args := []string{"--foo=abc", "--bar=def", "--baz=ghi"}
args := []string{"--foo=abc", "--bar=def", "--baz=ghi", "--qux="}
if err := fs.Parse(args); err == nil {
t.Errorf("ff.Parse(%v): want error, have none", args)
}
Expand Down