added () to config variant trimming character set (yonaskolb#1078)

DavidWoohyunLee · yonaskolb · web-flow · commit b6d87a1cc6ee · 2021-05-16T17:12:04.000+10:00
* added () to config variant trimming character set

* added test cases

* added test cases and changelog entry

* Update CHANGELOG.md

removed

Co-authored-by: Yonas Kolb &lt;yonaskolb@users.noreply.github.com&gt;

* fixed incorrect test case

Co-authored-by: Yonas Kolb &lt;yonaskolb@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Next Version
 
+#### Fixed
+- Added `()` to config variant trimming charater set to fix scheme config variant lookups for some configs like `Debug (Development)` that broke in 2.22.0  [#1078](https://github.com/yonaskolb/XcodeGen/pull/1078) @DavidWoohyunLee
+
 ## 2.22.0
 
 #### Added
diff --git a/Sources/ProjectSpec/Config.swift b/Sources/ProjectSpec/Config.swift
@@ -28,7 +28,7 @@ extension Config {
         guard self.type == type else { return false }
         let nameWithoutType = self.name.lowercased()
             .replacingOccurrences(of: type.name.lowercased(), with: "")
-            .trimmingCharacters(in: CharacterSet(charactersIn: " -_"))
+            .trimmingCharacters(in: CharacterSet(charactersIn: " -_()"))
         return nameWithoutType == variant.lowercased()
     }
 }
diff --git a/Tests/ProjectSpecTests/ProjectSpecTests.swift b/Tests/ProjectSpecTests/ProjectSpecTests.swift
@@ -359,6 +359,9 @@ class ProjectSpecTests: XCTestCase {
                 try expectVariant("Dev", for: Config(name: "Dev_debug", type: .debug), matches: true)
                 try expectVariant("Prod", for: Config(name: "PreProd debug", type: .debug), matches: false)
                 try expectVariant("Develop", for: Config(name: "Dev debug", type: .debug), matches: false)
+                try expectVariant("Development", for: Config(name: "Debug (Development)", type: .debug), matches: true)
+                try expectVariant("Staging", for: Config(name: "Debug (Staging)", type: .debug), matches: true)
+                try expectVariant("Production", for: Config(name: "Debug (Production)", type: .debug), matches: true)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ extension Config {`
`28`	`28`	`guard self.type == type else { return false }`
`29`	`29`	`let nameWithoutType = self.name.lowercased()`
`30`	`30`	`.replacingOccurrences(of: type.name.lowercased(), with: "")`
`31`		`- .trimmingCharacters(in: CharacterSet(charactersIn: " -_"))`
	`31`	`+ .trimmingCharacters(in: CharacterSet(charactersIn: " -_()"))`
`32`	`32`	`return nameWithoutType == variant.lowercased()`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,9 @@ class ProjectSpecTests: XCTestCase {`
`359`	`359`	`try expectVariant("Dev", for: Config(name: "Dev_debug", type: .debug), matches: true)`
`360`	`360`	`try expectVariant("Prod", for: Config(name: "PreProd debug", type: .debug), matches: false)`
`361`	`361`	`try expectVariant("Develop", for: Config(name: "Dev debug", type: .debug), matches: false)`
	`362`	`+ try expectVariant("Development", for: Config(name: "Debug (Development)", type: .debug), matches: true)`
	`363`	`+ try expectVariant("Staging", for: Config(name: "Debug (Staging)", type: .debug), matches: true)`
	`364`	`+ try expectVariant("Production", for: Config(name: "Debug (Production)", type: .debug), matches: true)`
`362`	`365`	`}`
`363`	`366`	`}`
`364`	`367`	`}`