[xcodegen] Remove isImportant

This only existed to avoid adding anything under
a folder reference. Now that we add those
references first, this is no longer needed.

Author: hamishknight

utils/swift-xcodegen/Sources/SwiftXcodeGen/Generator/ProjectGenerator.swift

@@ -199,10 +199,10 @@ fileprivate final class ProjectGenerator {
 
   @discardableResult
   private func getOrCreateRepoRef(
-    _ ref: ProjectSpec.PathReference, allowExcluded: Bool = false
+    _ ref: ProjectSpec.PathReference
   ) -> Xcode.FileReference? {
     let path = ref.path
-    guard allowExcluded || checkNotExcluded(path) else { return nil }
+    guard checkNotExcluded(path) else { return nil }
     return getOrCreateProjectRef(ref.withPath(repoRelativePath.appending(path)))
   }
 
@@ -629,8 +629,7 @@ fileprivate final class ProjectGenerator {
 
     // First add file/folder references.
     for ref in spec.referencesToAdd {
-      // Allow important references to bypass exclusion checks.
-      getOrCreateRepoRef(ref, allowExcluded: ref.isImportant)
+      getOrCreateRepoRef(ref)
     }
 
     // Gather the Swift targets to generate, including any dependencies.

utils/swift-xcodegen/Sources/SwiftXcodeGen/Generator/ProjectSpec.swift

@@ -83,14 +83,11 @@ extension ProjectSpec {
     var kind: Kind
     var path: RelativePath
 
-    /// Whether this reference should bypass exclusion checks.
-    var isImportant: Bool
-
-    static func file(_ path: RelativePath, isImportant: Bool = false) -> Self {
-      .init(kind: .file, path: path, isImportant: isImportant)
+    static func file(_ path: RelativePath) -> Self {
+      .init(kind: .file, path: path)
     }
-    static func folder(_ path: RelativePath, isImportant: Bool = false) -> Self {
-      .init(kind: .folder, path: path, isImportant: isImportant)
+    static func folder(_ path: RelativePath) -> Self {
+      .init(kind: .folder, path: path)
     }
 
     func withPath(_ newPath: RelativePath) -> Self {
@@ -145,20 +142,10 @@ extension ProjectSpec {
     self.knownUnbuildables.insert(path)
   }
 
-  public mutating func addReference(
-    to path: RelativePath, isImportant: Bool = false
-  ) {
+  public mutating func addReference(to path: RelativePath) {
     guard let path = mapPath(path, for: "file") else { return }
-    if repoRoot.appending(path).isDirectory {
-      if isImportant {
-        // Important folder references should block anything being added under
-        // them.
-        excludedPaths.append(.init(path: path))
-      }
-      referencesToAdd.append(.folder(path, isImportant: isImportant))
-    } else {
-      referencesToAdd.append(.file(path, isImportant: isImportant))
-    }
+    let isDir = repoRoot.appending(path).isDirectory
+    referencesToAdd.append(isDir ? .folder(path) : .file(path))
   }
 
   public mutating func addHeaders(in path: RelativePath) {

utils/swift-xcodegen/Sources/swift-xcodegen/SwiftXcodegen.swift

@@ -192,7 +192,7 @@ struct SwiftXcodegen: AsyncParsableCommand, Sendable {
           mayHaveUnbuildableFiles: true
         )
         if self.addTestFolders {
-          spec.addReference(to: "../clang-tools-extra/test", isImportant: true)
+          spec.addReference(to: "../clang-tools-extra/test")
         } else {
           // Avoid adding any headers present in the test folder.
           spec.addExcludedPath("../clang-tools-extra/test")
@@ -263,7 +263,7 @@ struct SwiftXcodegen: AsyncParsableCommand, Sendable {
         below: "../compiler-rt", addingPrefix: "extra-"
       )
       if self.addTestFolders {
-        spec.addReference(to: "../compiler-rt/test", isImportant: true)
+        spec.addReference(to: "../compiler-rt/test")
       } else {
         // Avoid adding any headers present in the test folder.
         spec.addExcludedPath("../compiler-rt/test")