[lldb][NFC] Simplify GenerateOptionUsage

[DavidSpickett]

Summary

Once we get into the if block we know the value of only_print_args.
Move some variables closer to point of use.

Depends on D125218

[JDevlieghere]

LGTM

lldb/source/Interpreter/Options.cpp

if (show_optional && !opt_def.required)
     strm.PutChar(']');
   if (footer && footer[0])
     strm.PutCString(footer);
   return true;
 }
 
 void Options::GenerateOptionUsage(Stream &strm, CommandObject &cmd,
                                   uint32_t screen_width) {
-  const bool only_print_args = cmd.IsDashDashCommand();
-
   auto opt_defs = GetDefinitions();
   const uint32_t save_indent_level = strm.GetIndentLevel();
   llvm::StringRef name = cmd.GetCommandName();
   StreamString arguments_str;
   cmd.GetFormattedCommandArguments(arguments_str);
 
   const uint32_t num_options = NumCommandOptions();
   if (num_options == 0)
     return;
 
+  const bool only_print_args = cmd.IsDashDashCommand();
   if (!only_print_args)
     strm.PutCString("\nCommand Options Usage:\n");
 
   strm.IndentMore(2);
 
   // First, show each usage level set of options, e.g. <cmd> [options-for-
   // level-0]
   //                                                   <cmd>
   //                                                   [options-for-level-1]
   //                                                   etc.
 
-  uint32_t num_option_sets = GetRequiredOptions().size();
-
   if (!only_print_args) {
+    uint32_t num_option_sets = GetRequiredOptions().size();
     for (uint32_t opt_set = 0; opt_set < num_option_sets; ++opt_set) {
-      uint32_t opt_set_mask;
-
-      opt_set_mask = 1 << opt_set;
       if (opt_set > 0)
         strm.Printf("\n");
       strm.Indent(name);
 
       // Different option sets may require different args.
       StreamString args_str;
+      uint32_t opt_set_mask = 1 << opt_set;
       cmd.GetFormattedCommandArguments(args_str, opt_set_mask);
 
       // First go through and print all options that take no arguments as a
       // single string. If a command has "-a" "-b" and "-c", this will show up
       // as [-abc]
 
       // We use a set here so that they will be sorted.
       std::set<int> required_options;
for (uint32_t opt_set = 0; opt_set < num_option_sets; ++opt_set) {
       // Now go through again, and this time only print the optional options.
       for (auto &def : opt_defs) {
         if (def.usage_mask & opt_set_mask && !def.required &&
             def.option_has_arg != OptionParser::eNoArgument)
           PrintOption(def, eDisplayBestOption, " ", nullptr, true, strm);
       }
 
       if (args_str.GetSize() > 0) {
-        if (cmd.WantsRawCommandString() && !only_print_args)
+        if (cmd.WantsRawCommandString())
           strm.Printf(" --");
-
         strm << " " << args_str.GetString();
-        if (only_print_args)
-          break;
       }
     }
   }
 
   if ((only_print_args || cmd.WantsRawCommandString()) &&
       arguments_str.GetSize() > 0) {
     if (!only_print_args)
       strm.PutChar('\n');