Handle text escaping (e.g. & -> &) last, to avoid interactions between 'replace...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49874 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/HTMLPrint.cpp b/Driver/HTMLPrint.cpp
index 54678dea3e38aea1312e389e1c01dc4466f1c088..ff04b0e609773243feec269b82494cf08c908a66 100644 (file)
--- a/Driver/HTMLPrint.cpp
+++ b/Driver/HTMLPrint.cpp
@@ -55,7 +55,6 @@ HTMLPrinter::~HTMLPrinter() {
 
   // Format the file.
   unsigned FileID = R.getSourceMgr().getMainFileID();
-  html::EscapeText(R, FileID, false, true);
   html::AddLineNumbers(R, FileID);
   html::AddHeaderFooterInternalBuiltinCSS(R, FileID);
 
@@ -67,6 +66,7 @@ HTMLPrinter::~HTMLPrinter() {
     html::SyntaxHighlight(R, FileID, *PP);
     html::HighlightMacros(R, FileID, *PP);
   }
+  html::EscapeText(R, FileID, false, true);
   
   
   // Open the output.