Plumb additionalFileRules from Workspace to TargetSourcesBuilder

Also fixes a new warning.

<rdar://problem/56328921>
<rdar://problem/56328927>

Author: aciidgh

Sources/PackageGraph/PackageGraphLoader.swift

@@ -63,6 +63,7 @@ public struct PackageGraphLoader {
     public func load(
         root: PackageGraphRoot,
         config: SwiftPMConfig = SwiftPMConfig(),
+        additionalFileRules: [FileRuleDescription] = [],
         externalManifests: [Manifest],
         requiredDependencies: Set<PackageReference> = [],
         unsafeAllowedPackages: Set<PackageReference> = [],

Sources/PackageLoading/PackageBuilder.swift

@@ -203,6 +203,9 @@ public final class PackageBuilder {
     /// Create the special REPL product for this package.
     private let createREPLProduct: Bool
 
+    /// The additionla file detection rules.
+    private let additionalFileRules: [FileRuleDescription]
+
     /// Create a builder for the given manifest and package `path`.
     ///
     /// - Parameters:
@@ -216,6 +219,7 @@ public final class PackageBuilder {
     public init(
         manifest: Manifest,
         path: AbsolutePath,
+        additionalFileRules: [FileRuleDescription] = [],
         fileSystem: FileSystem = localFileSystem,
         diagnostics: DiagnosticsEngine,
         isRootPackage: Bool,
@@ -225,6 +229,7 @@ public final class PackageBuilder {
         self.isRootPackage = isRootPackage
         self.manifest = manifest
         self.packagePath = path
+        self.additionalFileRules = additionalFileRules
         self.fileSystem = fileSystem
         self.diagnostics = diagnostics
         self.shouldCreateMultipleTestProducts = shouldCreateMultipleTestProducts
@@ -659,6 +664,7 @@ public final class PackageBuilder {
             packagePath: packagePath,
             target: manifestTarget,
             path: potentialModule.path,
+            additionalFileRules: additionalFileRules,
             extraExcludes: [publicHeadersPath],
             toolsVersion: manifest.toolsVersion,
             fs: fileSystem,

Sources/PackageLoading/TargetSourcesBuilder.swift

@@ -48,7 +48,7 @@ public struct TargetSourcesBuilder {
         packagePath: AbsolutePath,
         target: TargetDescription,
         path: AbsolutePath,
-        rules: [FileRuleDescription] = [],
+        additionalFileRules: [FileRuleDescription] = [],
         extraExcludes: [AbsolutePath] = [],
         toolsVersion: ToolsVersion = .currentToolsVersion,
         fs: FileSystem = localFileSystem,
@@ -59,7 +59,7 @@ public struct TargetSourcesBuilder {
         self.target = target
         self.diags = diags
         self.targetPath = path
-        self.rules = FileRuleDescription.builtinRules + rules
+        self.rules = FileRuleDescription.builtinRules + additionalFileRules
         self.toolsVersion = toolsVersion
         self.fs = fs
         let excludedPaths = target.exclude.map{ path.appending(RelativePath($0)) }

Sources/Workspace/Workspace.swift

@@ -335,6 +335,8 @@ public class Workspace {
 
     fileprivate var resolvedFileWatcher: ResolvedFileWatcher?
 
+    fileprivate let additionalFileRules: [FileRuleDescription]
+
     /// Typealias for dependency resolver we use in the workspace.
     fileprivate typealias PackageDependencyResolver = DependencyResolver
     fileprivate typealias PubgrubResolver = PubgrubDependencyResolver
@@ -364,6 +366,7 @@ public class Workspace {
         config: SwiftPMConfig = SwiftPMConfig(),
         fileSystem: FileSystem = localFileSystem,
         repositoryProvider: RepositoryProvider = GitRepositoryProvider(),
+        additionalFileRules: [FileRuleDescription] = [],
         isResolverPrefetchingEnabled: Bool = false,
         enablePubgrubResolver: Bool = false,
         skipUpdate: Bool = false,
@@ -381,6 +384,7 @@ public class Workspace {
         self.skipUpdate = skipUpdate
         self.enableResolverTrace = enableResolverTrace
         self.resolvedFile = pinsFile
+        self.additionalFileRules = additionalFileRules
 
         let repositoriesPath = self.dataPath.appending(component: "repositories")
         self.repositoryManager = RepositoryManager(
@@ -695,6 +699,7 @@ extension Workspace {
         return PackageGraphLoader().load(
             root: manifests.root,
             config: config,
+            additionalFileRules: additionalFileRules,
             externalManifests: externalManifests,
             requiredDependencies: manifests.computePackageURLs().required,
             unsafeAllowedPackages: manifests.unsafeAllowedPackages(),

Tests/PackageLoadingTests/PD4LoadingTests.swift

@@ -47,7 +47,7 @@ class PackageDescription4LoadingTests: XCTestCase {
     {
         do {
             try loadManifestThrowing(contents, line: line, body: body)
-        } catch ManifestParseError.invalidManifestFormat(let error) {
+        } catch ManifestParseError.invalidManifestFormat(let error, _) {
             print(error)
             XCTFail(file: #file, line: line)
         } catch {

Tests/PackageLoadingTests/PD4_2LoadingTests.swift

@@ -46,7 +46,7 @@ class PackageDescription4_2LoadingTests: XCTestCase {
     ) {
         do {
             try loadManifestThrowing(contents, line: line, body: body)
-        } catch ManifestParseError.invalidManifestFormat(let error) {
+        } catch ManifestParseError.invalidManifestFormat(let error, _) {
             print(error)
             XCTFail(file: #file, line: line)
         } catch {

Tests/PackageLoadingTests/TargetSourcesBuilderTests.swift

@@ -111,7 +111,7 @@ class TargetSourcesBuilderTests: XCTestCase {
             packagePath: .root,
             target: target,
             path: .root,
-            rules: [somethingRule],
+            additionalFileRules: [somethingRule],
             toolsVersion: .v5,
             fs: fs,
             diags: diags