Fix template type diffing coloring (r159216) when forcing color output to a file (not a terminal)

Reviewed (over the shoulder) by Richard Trieu.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/Frontend/TextDiagnostic.cpp b/lib/Frontend/TextDiagnostic.cpp
index 8b7332dbeb..bd766d354c 100644
--- a/lib/Frontend/TextDiagnostic.cpp
+++ b/lib/Frontend/TextDiagnostic.cpp
@@ -720,8 +720,11 @@ TextDiagnostic::printDiagnosticMessage(raw_ostream &OS,
 
   if (Columns)
     printWordWrapped(OS, Message, Columns, CurrentColumn);
-  else
-    OS << Message;
+  else {
+    bool Normal = true;
+    applyTemplateHighlighting(OS, Message, Normal);
+    assert(Normal && "Formatting should have returned to normal");
+  }
 
   if (ShowColors)
     OS.resetColor();