Added -help option to sourcekitd-test

test/SourceKit/Misc/usage.swift

@@ -0,0 +1,6 @@
+// Sanity check that -help works
+
+// RUN: not %sourcekitd-test -help | %FileCheck %s
+
+// CHECK: USAGE: sourcekitd-test [options] <inputs>
+

test/SourceKit/Misc/wrong_arguments.swift

@@ -0,0 +1,7 @@
+// Check that from invalid input, program suggests using -help
+
+// RUN: not %sourcekitd-test -this_option_does_not_exist 2>&1 | %FileCheck %s
+
+// CHECK: error: unknown argument: -this_option_does_not_exist
+// CHECK: Use -h or -help for assistance
+

tools/SourceKit/tools/sourcekitd-test/Options.td

@@ -102,3 +102,8 @@ def objc_name : Separate<["-"], "objc-name">,
 
 def objc_selector : Separate<["-"], "objc-selector">,
   HelpText<"Objective-C selector name to translate from">;
+
+def help : Flag<["-", "--"], "help">,
+  HelpText<"Display available options">;
+
+def h : Flag<["-"], "h">, Alias<help>;

tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp

@@ -146,6 +146,12 @@ bool TestOptions::parseArgs(llvm::ArrayRef<const char *> Args) {
       }
       break;
 
+    case OPT_help: {
+      printHelp(false);
+      return true;
+      break;
+    }
+
     case OPT_offset:
       if (StringRef(InputArg->getValue()).getAsInteger(10, Offset)) {
         llvm::errs() << "error: expected integer for 'offset'\n";
@@ -279,7 +285,8 @@ bool TestOptions::parseArgs(llvm::ArrayRef<const char *> Args) {
 
     case OPT_UNKNOWN:
       llvm::errs() << "error: unknown argument: "
-                   << InputArg->getAsString(ParsedArgs) << '\n';
+                   << InputArg->getAsString(ParsedArgs) << '\n'
+                   << "Use -h or -help for assistance" << '\n';
       return true;
     }
   }
@@ -292,3 +299,16 @@ bool TestOptions::parseArgs(llvm::ArrayRef<const char *> Args) {
 
   return false;
 }
+
+void TestOptions::printHelp(bool ShowHidden) const {
+
+  // Based off of swift/lib/Driver/Driver.cpp, at Driver::printHelp
+  //FIXME: should we use IncludedFlagsBitmask and ExcludedFlagsBitmask?
+  // Maybe not for modes such as Interactive, Batch, AutolinkExtract, etc,
+  // as in Driver.cpp. But could be useful for extra info, like HelpHidden.
+
+  TestOptTable Table;
+
+  Table.PrintHelp(llvm::outs(), "sourcekitd-test", "SourceKit Testing Tool",
+                      ShowHidden);
+}

tools/SourceKit/tools/sourcekitd-test/TestOptions.h

@@ -90,6 +90,7 @@ struct TestOptions {
   bool CollectActionables = false;
   bool isAsyncRequest = false;
   bool parseArgs(llvm::ArrayRef<const char *> Args);
+  void printHelp(bool ShowHidden) const;
 };
 
 }