[swift-inspect] Consolidate options into OptionGroups shared between subcommands.

Author: mikeash

tools/swift-inspect/Sources/swift-inspect/main.swift

@@ -152,15 +152,34 @@ struct SwiftInspect: ParsableCommand {
     ])
 }
 
+struct UniversalOptions: ParsableArguments {
+  @Argument(help: "The pid or partial name of the target process")
+  var nameOrPid: String
+}
+
+struct BacktraceOptions: ParsableArguments {
+  @Flag(help: "Show the backtrace for each allocation")
+  var backtrace: Bool
+
+  @Flag(help: "Show a long-form backtrace for each allocation")
+  var backtraceLong: Bool
+
+  var style: Backtrace.Style? {
+    backtrace ? .oneLine :
+    backtraceLong ? .long :
+    nil
+  }
+}
+
 struct DumpConformanceCache: ParsableCommand {
   static let configuration = CommandConfiguration(
     abstract: "Print the contents of the target's protocol conformance cache.")
 
-  @Argument(help: "The pid or partial name of the target process")
-  var nameOrPid: String
+  @OptionGroup()
+  var options: UniversalOptions
 
   func run() throws {
-    try withReflectionContext(nameOrPid: nameOrPid) { context, _ in
+    try withReflectionContext(nameOrPid: options.nameOrPid) { context, _ in
       try dumpConformanceCache(context: context)
     }
   }
@@ -169,22 +188,18 @@ struct DumpConformanceCache: ParsableCommand {
 struct DumpRawMetadata: ParsableCommand {
   static let configuration = CommandConfiguration(
     abstract: "Print the target's metadata allocations.")
-  @Argument(help: "The pid or partial name of the target process")
 
-  var nameOrPid: String
-
-  @Flag(help: "Show the backtrace for each allocation")
-  var backtrace: Bool
+  @OptionGroup()
+  var universalOptions: UniversalOptions
 
-  @Flag(help: "Show a long-form backtrace for each allocation")
-  var backtraceLong: Bool
+  @OptionGroup()
+  var backtraceOptions: BacktraceOptions
 
   func run() throws {
-    let style = backtrace ? Backtrace.Style.oneLine :
-                backtraceLong ? Backtrace.Style.long :
-                nil
-    try withReflectionContext(nameOrPid: nameOrPid) {
-      try dumpRawMetadata(context: $0, inspector: $1, backtraceStyle: style)
+    try withReflectionContext(nameOrPid: universalOptions.nameOrPid) {
+      try dumpRawMetadata(context: $0,
+                          inspector: $1,
+                          backtraceStyle: backtraceOptions.style)
     }
   }
 }
@@ -193,23 +208,17 @@ struct DumpGenericMetadata: ParsableCommand {
   static let configuration = CommandConfiguration(
     abstract: "Print the target's generic metadata allocations.")
 
-  @Argument(help: "The pid or partial name of the target process")
-  var nameOrPid: String
+  @OptionGroup()
+  var universalOptions: UniversalOptions
 
-  @Flag(help: "Show the backtrace for each allocation")
-  var backtrace: Bool
-
-  @Flag(help: "Show a long-form backtrace for each allocation")
-  var backtraceLong: Bool
+  @OptionGroup()
+  var backtraceOptions: BacktraceOptions
 
   func run() throws {
-    let style = backtrace ? Backtrace.Style.oneLine :
-                backtraceLong ? Backtrace.Style.long :
-                nil
-    try withReflectionContext(nameOrPid: nameOrPid) {
+    try withReflectionContext(nameOrPid: universalOptions.nameOrPid) {
       try dumpGenericMetadata(context: $0,
                               inspector: $1,
-                              backtraceStyle: style)
+                              backtraceStyle: backtraceOptions.style)
     }
   }
 }
@@ -218,11 +227,11 @@ struct DumpCacheNodes: ParsableCommand {
   static let configuration = CommandConfiguration(
     abstract: "Print the target's metadata cache nodes.")
 
-  @Argument(help: "The pid or partial name of the target process")
-  var nameOrPid: String
+  @OptionGroup()
+  var options: UniversalOptions
 
   func run() throws {
-    try withReflectionContext(nameOrPid: nameOrPid) {
+    try withReflectionContext(nameOrPid: options.nameOrPid) {
       try dumpMetadataCacheNodes(context: $0,
                                  inspector: $1)
     }