Skip to content

Commit 1fc861d

Browse files
committed
Fix pattern func for test
1 parent 282737c commit 1fc861d

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Tests/XcodeProjKitWriteTests.swift

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,16 @@ class XcodeProjKitWriteTests: XCTestCase {
148148
}
149149

150150
fileprivate extension String {
151-
func replacingOccurrences(matchingPattern pattern: String, replacementProvider: (String) -> String?) -> String {
152-
let expression = try! NSRegularExpression(pattern: pattern, options: [])
153-
let matches = expression.matches(in: self, options: [], range: NSRange(startIndex..<endIndex, in: self))
154-
return matches.reversed().reduce(into: self) { (current, result) in
155-
let range = Range(result.range, in: current)!
156-
let token = String(current[range])
157-
guard let replacement = replacementProvider(token) else { return }
158-
current.replaceSubrange(range, with: replacement)
151+
func replacingOccurrences(matchingPattern pattern: String, by replacement: String) -> String {
152+
do {
153+
let expression = try NSRegularExpression(pattern: pattern, options: [])
154+
let matches = expression.matches(in: self, options: [], range: NSRange(startIndex..<endIndex, in: self))
155+
return matches.reversed().reduce(into: self) { (current, result) in
156+
let range = Range(result.range, in: current)!
157+
current.replaceSubrange(range, with: replacement)
158+
}
159+
} catch {
160+
return self
159161
}
160162
}
161163
}

0 commit comments

Comments
 (0)