Skip to content

Fix completion of key-value pairs array #95

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
nobu merged 1 commit into from
Mar 17, 2025
Merged

Fix completion of key-value pairs array #95

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
2 changes: 1 addition & 1 deletion lib/optparse.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@ def make_switch(opts, block = nil)
block = notwice(o, block, 'block')
when Array, Hash
if Array === o
o, v = o.partition {|v| Completion.completable?(v)}
o, v = o.partition {|v,| Completion.completable?(v)}
values = notwice(v, values, 'values') unless v.empty?
next if o.empty?
end
Expand Down
6 changes: 6 additions & 0 deletions test/optparse/test_placearg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ def setup
@opt.def_option("--option [VAL]") {|x| @flag = x}
@opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
@opt.def_option("--enum [VAL]", [:Alpha, :Bravo, :Charlie]) {|x| @enum = x}
@opt.def_option("--enumval [VAL]", [[:Alpha, 1], [:Bravo, 2], [:Charlie, 3]]) {|x| @enum = x}
@opt.def_option("--integer [VAL]", Integer, [1, 2, 3]) {|x| @integer = x}
@opt.def_option("--range [VAL]", Integer, 1..3) {|x| @range = x}
@topt = nil
Expand Down Expand Up @@ -102,6 +103,11 @@ def test_enum
assert_equal(:Alpha, @enum)
end

def test_enum_pair
assert_equal([], no_error {@opt.parse!(%w"--enumval=A")})
assert_equal(1, @enum)
end

def test_enum_conversion
assert_equal([], no_error {@opt.parse!(%w"--integer=1")})
assert_equal(1, @integer)
Expand Down