diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-06-28 21:46:07 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-06-28 21:46:07 +0000 |
| commit | 50badd523b9b90c0731423d002b13a00bf754036 (patch) | |
| tree | e37e82b05df63f0510d32faadee88a87e8bfc163 | |
| parent | 0963017dcbc32176c79a251c3ab23bc35ac784e5 (diff) | |
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
| -rw-r--r-- | lib/Frontend/TextDiagnostic.cpp | 7 | ||||
| -rw-r--r-- | test/Misc/diag-template-diffing-color.cpp | 8 |
2 files changed, 13 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(); diff --git a/test/Misc/diag-template-diffing-color.cpp b/test/Misc/diag-template-diffing-color.cpp new file mode 100644 index 0000000000..edbf4c216d --- /dev/null +++ b/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 |