lix-project/lix
19
42
Fork 18
Code Issues 295 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Don't process an option if any of its arguments need completion

Browse source
This commit is contained in:
Eelco Dolstra 2020-07-01 20:31:39 +02:00
parent d746503e5c
commit 6ff9aa8df7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libutil/args.cc
View file

@ -123,17 +123,21 @@ bool Args::processFlag(Strings::iterator & pos, Strings::iterator end)
auto process = [&](const std::string & name, const Flag & flag) -> bool { auto process = [&](const std::string & name, const Flag & flag) -> bool {
++pos; ++pos;
std::vector<std::string> args; std::vector<std::string> args;
bool anyCompleted = false;
for (size_t n = 0 ; n < flag.handler.arity; ++n) { for (size_t n = 0 ; n < flag.handler.arity; ++n) {
if (pos == end) { if (pos == end) {
if (flag.handler.arity == ArityAny) break; if (flag.handler.arity == ArityAny) break;
throw UsageError("flag '%s' requires %d argument(s)", name, flag.handler.arity); throw UsageError("flag '%s' requires %d argument(s)", name, flag.handler.arity);
} }
if (flag.completer) if (flag.completer)
if (auto prefix = needsCompletion(*pos)) if (auto prefix = needsCompletion(*pos)) {
anyCompleted = true;
flag.completer(n, *prefix); flag.completer(n, *prefix);
}
args.push_back(*pos++); args.push_back(*pos++);
} }
flag.handler.fun(std::move(args)); if (!anyCompleted)
flag.handler.fun(std::move(args));
return true; return true;
}; };