Fix membership exceptions for nested synced folder with intermediate groups

Author: macguru

Sources/XcodeGenKit/PBXProjGenerator.swift

@@ -1457,29 +1457,30 @@ public class PBXProjGenerator {
         }
 
         // add fileSystemSynchronizedGroups
-        let synchronizedRootGroups = sourceFiles.compactMap { $0.fileReference as? PBXFileSystemSynchronizedRootGroup }
+		let synchronizedRootGroups: [PBXFileSystemSynchronizedRootGroup] = sourceFiles.compactMap { sourceFile in
+            guard let syncedGroup = sourceFile.fileReference as? PBXFileSystemSynchronizedRootGroup else { return nil }
+            
+            configureMembershipExceptions(
+                for: syncedGroup,
+                path: sourceFile.path,
+                target: target,
+                targetObject: targetObject,
+                infoPlistFiles: infoPlistFiles
+            )
+            return syncedGroup
+        }
         if !synchronizedRootGroups.isEmpty {
-            for syncedGroup in synchronizedRootGroups {
-                configureMembershipExceptions(
-                    for: syncedGroup,
-                    target: target,
-                    targetObject: targetObject,
-                    infoPlistFiles: infoPlistFiles
-                )
-            }
             targetObject.fileSystemSynchronizedGroups = synchronizedRootGroups
         }
     }
 
     private func configureMembershipExceptions(
         for syncedGroup: PBXFileSystemSynchronizedRootGroup,
+        path syncedPath: Path,
         target: Target,
         targetObject: PBXTarget,
         infoPlistFiles: [Config: String]
     ) {
-        guard let syncedGroupPath = syncedGroup.path else { return }
-        let syncedPath = (project.basePath + Path(syncedGroupPath)).normalize()
-
         guard let targetSource = target.sources.first(where: {
             (project.basePath + $0.path).normalize() == syncedPath
         }) else { return }

Tests/XcodeGenKitTests/SourceGeneratorTests.swift

@@ -203,6 +203,29 @@ class SourceGeneratorTests: XCTestCase {
                 try expect(exceptions.contains("a.swift")) == false
             }
 
+            $0.it("adds membership exceptions for nested synced folder with intermediate groups") {
+                let directories = """
+                Sources:
+                  Nested:
+                    - a.swift
+                    - b.swift
+                """
+                try createDirectories(directories)
+
+                let source = TargetSource(path: "Sources/Nested", excludes: ["b.swift"], type: .syncedFolder)
+                let target = Target(name: "Test", type: .application, platform: .iOS, sources: [source])
+                let project = Project(basePath: directoryPath, name: "Test", targets: [target], options: .init(createIntermediateGroups: true))
+
+                let pbxProj = try project.generatePbxProj()
+                let sourcesGroup = try unwrap(try pbxProj.getMainGroup().children.first { $0.nameOrPath == "Sources" } as? PBXGroup)
+                let syncedFolder = try unwrap(sourcesGroup.children.compactMap { $0 as? PBXFileSystemSynchronizedRootGroup }.first)
+
+                let exceptionSet = try unwrap(syncedFolder.exceptions?.first as? PBXFileSystemSynchronizedBuildFileExceptionSet)
+                let exceptions = try unwrap(exceptionSet.membershipExceptions)
+
+                try expect(exceptions) == ["b.swift"]
+            }
+
             $0.it("auto-excludes Info.plist from synced folder membership") {
                 let directories = """
                 Sources: