Merge pull request #402 from benlangmuir/derived-sources-5.5

[5.5] [swiftpm] Add derived sources to module compiler arguments

Author: benlangmuir

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -355,7 +355,7 @@ extension SwiftPMWorkspace {
       args += ["-parse-as-library"]
     }
     args += ["-c"]
-    args += td.target.sources.paths.map { $0.pathString }
+    args += td.sources.map { $0.pathString }
     args += ["-I", buildPath.pathString]
     args += td.compileArguments()
 

Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift

@@ -530,6 +530,41 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       check(resolveSymlinks(ah).pathString, arguments: argsH ?? [])
     }
   }
+
+  func testSwiftDerivedSources() throws {
+    // FIXME: should be possible to use InMemoryFileSystem.
+    let fs = localFileSystem
+    try! withTemporaryDirectory(removeTreeOnDeinit: true) { tempDir in
+      try! fs.createFiles(root: tempDir, files: [
+        "pkg/Sources/lib/a.swift": "",
+        "pkg/Sources/lib/a.txt": "",
+        "pkg/Package.swift": """
+            // swift-tools-version:5.3
+            import PackageDescription
+            let package = Package(name: "a", products: [], dependencies: [],
+              targets: [
+                .target(
+                  name: "lib",
+                  dependencies: [],
+                  resources: [.copy("a.txt")])])
+            """
+      ])
+      let packageRoot = resolveSymlinks(tempDir.appending(component: "pkg"))
+      let tr = ToolchainRegistry.shared
+      let ws = try! SwiftPMWorkspace(
+        workspacePath: packageRoot,
+        toolchainRegistry: tr,
+        fileSystem: fs,
+        buildSetup: TestSourceKitServer.serverOptions.buildSetup)
+
+      let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
+      let arguments = ws.settings(for: aswift.asURI, .swift)!.compilerArguments
+      check(aswift.pathString, arguments: arguments)
+      XCTAssertNotNil(arguments.firstIndex(where: {
+          $0.hasSuffix(".swift") && $0.contains("DerivedSources")
+        }), "missing resource_bundle_accessor.swift from \(arguments)")
+    }
+  }
 }
 
 private func checkNot(