Fix subcommand suggestion (#659)

wx257osn2 · ken-matsui · web-flow · commit ec1305238821 · 2022-07-24T00:10:37.000Z
* suggest subcommand even with flags/options

* stop subcommand suggestion if subcommand is correct

* use member functions instead of operator overloads

Co-authored-by: Ken Matsui &lt;26405363+ken-matsui@users.noreply.github.com&gt;

* add braces

Co-authored-by: Ken Matsui &lt;26405363+ken-matsui@users.noreply.github.com&gt;

* use i32 instead of int

Co-authored-by: Ken Matsui &lt;26405363+ken-matsui@users.noreply.github.com&gt;

Co-authored-by: Ken Matsui &lt;26405363+ken-matsui@users.noreply.github.com&gt;
diff --git a/src/main.cc b/src/main.cc
@@ -184,9 +184,18 @@ main(const int argc, char* argv[]) {
         .is_err();
   } catch (const structopt::exception& e) {
     if (argc > 1) {
+      i32 subcommand_index = 1;
+      for (; subcommand_index < argc; ++subcommand_index) {
+        if (argv[subcommand_index][0] != '-') {
+          break;
+        }
+      }
+
       // 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.has_value() && sugg.value() != argv[subcommand_index]) {
         err_logger->error(
             "{}\n"
             "  --> Did you mean `{}`?\n\n"
