Add paths from compiler arguments spelled with = to the diagnose bundle

Eg. if the crash contained `-fmodule-map-file=/path/to/module.modulemap`, we weren’t including `/path/to/module.modulemap` in the diagnose bundle.

Author: ahoppen

Sources/Diagnose/ReproducerBundle.swift

@@ -13,6 +13,17 @@
 import Foundation
 import SKCore
 
+private func copyPathToBundleIfNecessary(_ path: String, bundlePath: URL) {
+  guard !path.contains(".app"), !path.contains(".xctoolchain"), !path.contains("/usr/") else {
+    // Don't include files in Xcode (.app), Xcode toolchains or usr because they are most likely binary files that
+    // aren't user specific and would bloat the reproducer bundle.
+    return
+  }
+  let dest = URL(fileURLWithPath: bundlePath.path + path)
+  try? FileManager.default.createDirectory(at: dest.deletingLastPathComponent(), withIntermediateDirectories: true)
+  try? FileManager.default.copyItem(at: URL(fileURLWithPath: path), to: dest)
+}
+
 /// Create a folder that contains all files that should be necessary to reproduce a sourcekitd crash.
 /// - Parameters:
 ///   - requestInfo: The reduced request info
@@ -47,14 +58,13 @@ func makeReproducerBundle(for requestInfo: RequestInfo, toolchain: Toolchain, bu
     )
   }
   for compilerArg in requestInfo.compilerArgs {
-    // Copy all files from the compiler arguments into the reproducer bundle.
-    // Don't include files in Xcode (.app), Xcode toolchains or usr because they are most likely binary files that aren't user specific and would bloat the reproducer bundle.
-    if compilerArg.hasPrefix("/"), !compilerArg.contains(".app"), !compilerArg.contains(".xctoolchain"),
-      !compilerArg.contains("/usr/")
-    {
-      let dest = URL(fileURLWithPath: bundlePath.path + compilerArg)
-      try? FileManager.default.createDirectory(at: dest.deletingLastPathComponent(), withIntermediateDirectories: true)
-      try? FileManager.default.copyItem(at: URL(fileURLWithPath: compilerArg), to: dest)
+    // Find the first slash so we are also able to copy files from eg.
+    // `-fmodule-map-file=/path/to/module.modulemap`
+    // `-I/foo/bar`
+    guard let firstSlash = compilerArg.firstIndex(of: "/") else {
+      continue
     }
+    let possiblePath = String(compilerArg[firstSlash...])
+    copyPathToBundleIfNecessary(possiblePath, bundlePath: bundlePath)
   }
 }