diff options
| -rw-r--r-- | clang/tools/clang-format/ClangFormat.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp index 95b53524ff8..1d934970334 100644 --- a/clang/tools/clang-format/ClangFormat.cpp +++ b/clang/tools/clang-format/ClangFormat.cpp @@ -199,9 +199,11 @@ static bool fillRanges(MemoryBuffer *Code, } static void outputReplacementXML(StringRef Text) { + // FIXME: When we sort includes, we need to make sure the stream is correct + // utf-8. size_t From = 0; size_t Index; - while ((Index = Text.find_first_of("\n\r", From)) != StringRef::npos) { + while ((Index = Text.find_first_of("\n\r<&", From)) != StringRef::npos) { llvm::outs() << Text.substr(From, Index - From); switch (Text[Index]) { case '\n': @@ -210,6 +212,12 @@ static void outputReplacementXML(StringRef Text) { case '\r': llvm::outs() << " "; break; + case '<': + llvm::outs() << "<"; + break; + case '&': + llvm::outs() << "&"; + break; default: llvm_unreachable("Unexpected character encountered!"); } |
