Skip to content
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

Jump to bottom

Fix subcommand suggestion #659

Merged
merged 6 commits into from
Jul 24, 2022
Merged

Fix subcommand suggestion #659

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a60b45d
suggest subcommand even with flags/options
wx257osn2 Jul 23, 2022
8a630c6
stop subcommand suggestion if subcommand is correct
wx257osn2 Jul 23, 2022
c7da253
use member functions instead of operator overloads
wx257osn2 Jul 23, 2022
fd4313e
add braces
wx257osn2 Jul 23, 2022
136eebe
use i32 instead of int
wx257osn2 Jul 23, 2022
099a57d
Merge branch 'main' into fix-subcommand-suggestion
ken-matsui Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,16 @@ main(const int argc, char* argv[]) {
.is_err();
} catch (const structopt::exception& e) {
if (argc > 1) {
int subcommand_index = 1;
wx257osn2 marked this conversation as resolved.
Show resolved Hide resolved
for (; subcommand_index < argc; ++subcommand_index)
if (argv[subcommand_index][0] != '-')
break;
wx257osn2 marked this conversation as resolved.
Show resolved Hide resolved

// try correcting typo
if (const auto sugg =
util::lev_distance::find_similar_str(argv[1], command_list)) {
if (const auto sugg = util::lev_distance::find_similar_str(
argv[subcommand_index], command_list
);
sugg && *sugg != argv[subcommand_index]) {
wx257osn2 marked this conversation as resolved.
Show resolved Hide resolved
err_logger->error(
"{}\n"
" --> Did you mean `{}`?\n\n"
Expand Down