Merge pull request #59 from swift-xcode/escaping

fix escaping of ""
tuist · Aug 28, 2017 · eea7fbb · eea7fbb
2 parents 0b752d8 + 29c508f
commit eea7fbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Sources/CommentedString.swift b/Sources/CommentedString.swift
@@ -36,10 +36,10 @@ struct CommentedString {
 
         // escape quotes
         var range: Range<String.Index>?
-        if escaped.isQuoted {
+        if escaped.isQuoted && escaped.characters.count > 1 {
             range = escaped.index(after: escaped.startIndex)..<escaped.index(before: escaped.endIndex)
         }
-        escaped = escaped.replacingOccurrences(of: "([^\\\\])(\")", with: "$1\\\\$2", options: .regularExpression, range: range)
+        escaped = escaped.replacingOccurrences(of: "\"", with: "\\\"", range: range).replacingOccurrences(of: "\\\\\"", with: "\\\"")
 
         if !escaped.isQuoted && escaped.rangeOfCharacter(from: CommentedString.invalidCharacters) != nil {
             escaped = escaped.quoted

diff --git a/Tests/xcodeprojTests/PBXProjWriterSpecs.swift b/Tests/xcodeprojTests/PBXProjWriterSpecs.swift
@@ -69,11 +69,17 @@ class PBXProjWriterSpecs: XCTestCase {
             "a\na".quoted: "a\(escapedNewline)a".quoted,
             "a\(escapedNewline)a": "a\(escapedNewline)a".quoted,
             "a\(escapedNewline)a".quoted: "a\(escapedNewline)a".quoted,
+            "\"": escapedQuote.quoted,
+            "\"\"": "\"\"",
+            "\"\"\"\"": "\(escapedQuote)\(escapedQuote)".quoted,
+            "a=\"\"": "a=\(escapedQuote)\(escapedQuote)".quoted,
         ]
 
         for (initial, expected) in values {
             let escapedString = CommentedString(initial).validString
-            XCTAssertEqual(escapedString, expected)
+            if escapedString != expected {
+                XCTFail("Escaped strings are not equal:\ninitial: \(initial)\nexpect:  \(expected)\nescaped: \(escapedString) ")
+            }
         }
     }