diff options
| -rw-r--r-- | clang/lib/Frontend/TextDiagnostic.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Misc/diag-template-diffing-color.cpp | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/clang/lib/Frontend/TextDiagnostic.cpp b/clang/lib/Frontend/TextDiagnostic.cpp index 8b7332dbeb5..bd766d354c9 100644 --- a/clang/lib/Frontend/TextDiagnostic.cpp +++ b/clang/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(); diff --git a/clang/test/Misc/diag-template-diffing-color.cpp b/clang/test/Misc/diag-template-diffing-color.cpp new file mode 100644 index 00000000000..edbf4c216d2 --- /dev/null +++ b/clang/test/Misc/diag-template-diffing-color.cpp @@ -0,0 +1,8 @@ +// RUN: %clang_cc1 -fsyntax-only -fcolor-diagnostics %s 2>&1 | FileCheck %s +// XFAIL: cygwin,mingw32,win32 +template<typename> struct foo {}; +void func(foo<int>); +int main() { + func(foo<double>()); +} +// CHECK: {{.*}}candidate function not viable: no known conversion from 'foo<{{.}}[0;1;36mdouble{{.}}[0m>' to 'foo<{{.}}[0;1;36mint{{.}}[0m>' for 1st argument{{.}}[0m |
