Merge pull request #1968 from cmcgee1024/symbol_graph_options

Add symbol graph options to swift driver

Author: cmcgee1024

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -907,6 +907,8 @@ extension Driver {
     try commandLine.appendLast(.includeSpiSymbols, from: &parsedOptions)
     try commandLine.appendLast(.emitExtensionBlockSymbols, .omitExtensionBlockSymbols, from: &parsedOptions)
     try commandLine.appendLast(.symbolGraphMinimumAccessLevel, from: &parsedOptions)
+    try commandLine.appendLast(.symbolGraphPrettyPrint, from: &parsedOptions)
+    try commandLine.appendLast(.symbolGraphSkipSynthesizedMembers, from: &parsedOptions)
   }
 
   mutating func addEntry(_ entries: inout [VirtualPath.Handle: [FileType: VirtualPath.Handle]], input: TypedVirtualPath?, output: TypedVirtualPath) throws {

Sources/SwiftOptions/Options.swift

@@ -889,6 +889,8 @@ extension Option {
   public static let switchCheckingInvocationThresholdEQ: Option = Option("-switch-checking-invocation-threshold=", .joined, attributes: [.helpHidden, .frontend, .noDriver])
   public static let symbolGraphAllowAvailabilityPlatforms: Option = Option("-symbol-graph-allow-availability-platforms", .separate, attributes: [.helpHidden, .frontend, .noInteractive, .supplementaryOutput], metaVar: "<platforms>", helpText: "Restrict availability metadata to the given platforms, e.g. 'macOS,Swift'")
   public static let symbolGraphBlockAvailabilityPlatforms: Option = Option("-symbol-graph-block-availability-platforms", .separate, attributes: [.helpHidden, .frontend, .noInteractive, .supplementaryOutput], metaVar: "<platforms>", helpText: "Remove the given platforms from symbol graph availability metadata, e.g. 'macOS,Swift'")
+  public static let symbolGraphPrettyPrint: Option = Option("-symbol-graph-pretty-print", .flag, attributes: [.helpHidden, .noInteractive], helpText: "Pretty-print the output symbol graph JSON")
+  public static let symbolGraphSkipSynthesizedMembers: Option = Option("-symbol-graph-skip-synthesized-members", .flag, attributes: [.helpHidden, .noInteractive], helpText: "Skip members inherited through classes or default implementations")
   public static let symbolGraphMinimumAccessLevel: Option = Option("-symbol-graph-minimum-access-level", .separate, attributes: [.helpHidden, .frontend, .noInteractive, .supplementaryOutput], metaVar: "<level>", helpText: "Include symbols with this access level or more when emitting a symbol graph")
   public static let sysroot: Option = Option("-sysroot", .separate, attributes: [.frontend, .synthesizeInterface, .argumentIsPath], metaVar: "<sysroot>", helpText: "Native Platform sysroot")
   public static let S: Option = Option("-S", .flag, alias: Option.emitAssembly, attributes: [.frontend, .noInteractive], group: .modes)
@@ -1860,6 +1862,8 @@ extension Option {
       Option.symbolGraphAllowAvailabilityPlatforms,
       Option.symbolGraphBlockAvailabilityPlatforms,
       Option.symbolGraphMinimumAccessLevel,
+      Option.symbolGraphPrettyPrint,
+      Option.symbolGraphSkipSynthesizedMembers,
       Option.sysroot,
       Option.S,
       Option.tabWidth,

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -3550,6 +3550,32 @@ final class SwiftDriverTests: XCTestCase {
     }
   }
 
+  func testEmitSymbolGraphPrettyPrint() throws {
+    do {
+      let root = localFileSystem.currentWorkingDirectory!.appending(components: "foo", "bar")
+
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-emit-symbol-graph", "-emit-symbol-graph-dir", "/foo/bar/", "-symbol-graph-pretty-print", "-emit-library"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+
+      // We don't know the output file of the symbol graph, just make sure the flag is passed along.
+      XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-emit-symbol-graph"))
+      XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-symbol-graph-pretty-print"))
+    }
+  }
+
+  func testEmitSymbolGraphSkipSynthesizedMembers() throws {
+    do {
+      let root = localFileSystem.currentWorkingDirectory!.appending(components: "foo", "bar")
+
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-emit-module-path", rebase("Test.swiftmodule", at: root), "-emit-symbol-graph", "-emit-symbol-graph-dir", "/foo/bar/", "-symbol-graph-skip-synthesized-members", "-emit-library"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+
+      // We don't know the output file of the symbol graph, just make sure the flag is passed along.
+      XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-emit-symbol-graph"))
+      XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-symbol-graph-skip-synthesized-members"))
+    }
+  }
+
   func testEmitModuleSeparately() throws {
     var envVars = ProcessEnv.block
     envVars["SWIFT_DRIVER_LD_EXEC"] = ld.nativePathString(escaped: false)