dump-symbol-graph: add support for -emit-extension-block-symbols and -omit-extension-block-symbols flags

Author: theMomax

Sources/Commands/SwiftPackageTool.swift

@@ -588,6 +588,10 @@ extension SwiftPackageTool {
 
         @Flag(help: "Add symbols with SPI information to the symbol graph.")
         var includeSPISymbols = false
+        
+        @Flag(help: "Emit extension block symbols for extensions to external types or directly associate members and conformances with the extended nominal.")
+        var extensionBlockSymbolBehavior: ExtensionBlockSymbolBehavior = .omitExtensionBlockSymbols
+
 
         func run(_ swiftTool: SwiftTool) throws {
             // Build the current package.
@@ -604,6 +608,7 @@ extension SwiftPackageTool {
                 minimumAccessLevel: minimumAccessLevel,
                 skipInheritedDocs: skipInheritedDocs,
                 includeSPISymbols: includeSPISymbols,
+                emitExtensionBlockSymbols: extensionBlockSymbolBehavior == .emitExtensionBlockSymbols,
                 outputFormat: .json(pretty: prettyPrint)
             )
 
@@ -624,6 +629,11 @@ extension SwiftPackageTool {
             print("Files written to", symbolGraphDirectory.pathString)
         }
     }
+    
+    enum ExtensionBlockSymbolBehavior: String, EnumerableFlag {
+        case emitExtensionBlockSymbols
+        case omitExtensionBlockSymbols
+    }
 
     struct DumpPackage: SwiftCommand {
         static let configuration = CommandConfiguration(
@@ -1428,6 +1438,7 @@ final class PluginDelegate: PluginInvocationDelegate {
         }
         symbolGraphExtractor.skipInheritedDocs = true
         symbolGraphExtractor.includeSPISymbols = options.includeSPI
+        symbolGraphExtractor.emitExtensionBlockSymbols = options.emitExtensionBlocks
 
         // Determine the output directory, and remove any old version if it already exists.
         guard let package = packageGraph.package(for: target) else {

Sources/Commands/Utilities/SymbolGraphExtract.swift

@@ -26,6 +26,7 @@ public struct SymbolGraphExtract {
     var minimumAccessLevel = AccessLevel.public
     var skipInheritedDocs = false
     var includeSPISymbols = false
+    var emitExtensionBlockSymbols = false
     var outputFormat = OutputFormat.json(pretty: false)
 
     /// Access control levels.
@@ -70,6 +71,11 @@ public struct SymbolGraphExtract {
         if includeSPISymbols {
             commandLine += ["-include-spi-symbols"]
         }
+        if emitExtensionBlockSymbols {
+            commandLine += ["-emit-extension-block-symbols"]
+        } else {
+            commandLine += ["-omit-extension-block-symbols"]
+        }
         switch outputFormat {
         case .json(let pretty):
             if pretty {

Sources/PackagePlugin/PackageManagerProxy.swift

@@ -229,11 +229,15 @@ public struct PackageManager {
 
         /// Whether to include symbols marked as SPI.
         public var includeSPI: Bool
+
+        /// Whether to emit symbols for extensions to external types.
+        public var emitExtensionBlocks: Bool
 
-        public init(minimumAccessLevel: AccessLevel = .public, includeSynthesized: Bool = false, includeSPI: Bool = false) {
+        public init(minimumAccessLevel: AccessLevel = .public, includeSynthesized: Bool = false, includeSPI: Bool = false, emitExtensionBlocks: Bool = false) {
             self.minimumAccessLevel = minimumAccessLevel
             self.includeSynthesized = includeSynthesized
             self.includeSPI = includeSPI
+            self.emitExtensionBlocks = emitExtensionBlocks
         }
     }
 
@@ -410,6 +414,7 @@ fileprivate extension PluginToHostMessage.SymbolGraphOptions {
         self.minimumAccessLevel = .init(options.minimumAccessLevel)
         self.includeSynthesized = options.includeSynthesized
         self.includeSPI = options.includeSPI
+        self.emitExtensionBlocks = options.emitExtensionBlocks
     }
 }
 

Sources/PackagePlugin/PluginMessages.swift

@@ -315,5 +315,6 @@ enum PluginToHostMessage: Codable {
             }
             var includeSynthesized: Bool
             var includeSPI: Bool
+            var emitExtensionBlocks: Bool
         }
 }

Sources/SPMBuildCore/PluginInvocation.swift

@@ -663,6 +663,7 @@ public struct PluginInvocationSymbolGraphOptions {
     }
     public var includeSynthesized: Bool
     public var includeSPI: Bool
+    public var emitExtensionBlocks: Bool
 }
 
 public struct PluginInvocationSymbolGraphResult {
@@ -922,6 +923,7 @@ fileprivate extension PluginInvocationSymbolGraphOptions {
         self.minimumAccessLevel = .init(options.minimumAccessLevel)
         self.includeSynthesized = options.includeSynthesized
         self.includeSPI = options.includeSPI
+        self.emitExtensionBlocks = options.emitExtensionBlocks
     }
 }