Escape backslashes properly when converting to the DSL #436
Conversation
… strings when converting to the DSL.
|
@swift-ci please test |
| @@ -578,7 +578,7 @@ extension PrettyPrinter { | |||
| extension String { | |||
| // TODO: Escaping? | |||
| fileprivate var _quoted: String { | |||
| "\"\(self._replacing("\"", with: "\\\""))\"" | |||
| "\"\(self._replacing("\\", with: "\\\\")._replacing("\"", with: "\\\""))\"" | |||
There was a problem hiding this comment.
| "\"\(self._replacing("\\", with: "\\\\")._replacing("\"", with: "\\\""))\"" | |
| "\"\(self._replacing(#"\"#, with: #"\\"#)._replacing(#"""#, with: #"\""#))\"" |
There was a problem hiding this comment.
Or we can emit it as a raw string if it has any backslashes or quotes inside it. We could do a quick check to count the number of hashes prior to a backslash and emit a raw string with one additional one.
There was a problem hiding this comment.
I thought about counting hashes, but it seemed like it wasn't worth the effort. But I'm all for using raw strings in your suggested change. I was mostly preserving the way it had been written.
| func testQuoting() throws { | ||
| try testConversion(#"\\\"a\""#, #""" | ||
| Regex { | ||
| "\\\"a\"" |
There was a problem hiding this comment.
Is this the right conversion? The input is raw, so IIUC it has 3 full backslashes, then a quote then a full backslash and another quote.
There was a problem hiding this comment.
I'll update the test. The \s in \" in the regex to convert is ignored when parsing, but not necessary.
…arser ignores it in front of a `"`, but it's confusing.)
|
@swift-ci please test |
Fix an issue where we weren't properly escaping backslashes in quote strings when converting to the DSL.