replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When applying a template diff highlighting to a diagnostic message, remember 

to reapply the bold formatting when needed.

llvm-svn: 159386
This commit is contained in:
Richard Trieu 2012-06-28 22:39:03 +00:00
parent b97a4e8bc2
commit a71f0de454
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clang/lib/Frontend/TextDiagnostic.cpp
View File

@ -41,15 +41,18 @@ static const enum raw_ostream::Colors savedColor =
/// \brief Add highlights to differences in template strings. /// \brief Add highlights to differences in template strings.
static void applyTemplateHighlighting(raw_ostream &OS, StringRef Str, static void applyTemplateHighlighting(raw_ostream &OS, StringRef Str,
bool &Normal) { bool &Normal, bool Bold) {
for (unsigned i = 0, e = Str.size(); i < e; ++i) for (unsigned i = 0, e = Str.size(); i < e; ++i)
if (Str[i] != ToggleHighlight) { if (Str[i] != ToggleHighlight) {
OS << Str[i]; OS << Str[i];
} else { } else {
if (Normal) if (Normal)
OS.changeColor(templateColor, true); OS.changeColor(templateColor, true);
else else {
OS.resetColor(); OS.resetColor();
if (Bold)
OS.changeColor(savedColor, true);
}
Normal = !Normal; Normal = !Normal;
} }
} }
@ -586,6 +589,7 @@ static unsigned findEndOfWord(unsigned Start, StringRef Str,
/// \param Column the column number at which the first character of \p /// \param Column the column number at which the first character of \p
/// Str will be printed. This will be non-zero when part of the first /// Str will be printed. This will be non-zero when part of the first
/// line has already been printed. /// line has already been printed.
/// \param Bold if the current text should be bold
/// \param Indentation the number of spaces to indent any lines beyond /// \param Indentation the number of spaces to indent any lines beyond
/// the first line. /// the first line.
/// \returns true if word-wrapping was required, or false if the /// \returns true if word-wrapping was required, or false if the
@ -593,6 +597,7 @@ static unsigned findEndOfWord(unsigned Start, StringRef Str,
static bool printWordWrapped(raw_ostream &OS, StringRef Str, static bool printWordWrapped(raw_ostream &OS, StringRef Str,
unsigned Columns, unsigned Columns,
unsigned Column = 0, unsigned Column = 0,
bool Bold = false,
unsigned Indentation = WordWrapIndentation) { unsigned Indentation = WordWrapIndentation) {
const unsigned Length = std::min(Str.find('\n'), Str.size()); const unsigned Length = std::min(Str.find('\n'), Str.size());
bool TextNormal = true; bool TextNormal = true;
@ -620,7 +625,7 @@ static bool printWordWrapped(raw_ostream &OS, StringRef Str,
Column += 1; Column += 1;
} }
applyTemplateHighlighting(OS, Str.substr(WordStart, WordLength), applyTemplateHighlighting(OS, Str.substr(WordStart, WordLength),
TextNormal); TextNormal, Bold);
Column += WordLength; Column += WordLength;
continue; continue;
} }
@ -630,13 +635,13 @@ static bool printWordWrapped(raw_ostream &OS, StringRef Str,
OS << '\n'; OS << '\n';
OS.write(&IndentStr[0], Indentation); OS.write(&IndentStr[0], Indentation);
applyTemplateHighlighting(OS, Str.substr(WordStart, WordLength), applyTemplateHighlighting(OS, Str.substr(WordStart, WordLength),
TextNormal); TextNormal, Bold);
Column = Indentation + WordLength; Column = Indentation + WordLength;
Wrapped = true; Wrapped = true;
} }
// Append any remaning text from the message with its existing formatting. // Append any remaning text from the message with its existing formatting.
applyTemplateHighlighting(OS, Str.substr(Length), TextNormal); applyTemplateHighlighting(OS, Str.substr(Length), TextNormal, Bold);
assert(TextNormal && "Text highlighted at end of diagnostic message."); assert(TextNormal && "Text highlighted at end of diagnostic message.");
@ -708,21 +713,25 @@ TextDiagnostic::printDiagnosticMessage(raw_ostream &OS,
StringRef Message, StringRef Message,
unsigned CurrentColumn, unsigned Columns, unsigned CurrentColumn, unsigned Columns,
bool ShowColors) { bool ShowColors) {
bool Bold = false;
if (ShowColors) { if (ShowColors) {
// Print warnings, errors and fatal errors in bold, no color // Print warnings, errors and fatal errors in bold, no color
switch (Level) { switch (Level) {
case DiagnosticsEngine::Warning: OS.changeColor(savedColor, true); break; case DiagnosticsEngine::Warning:
case DiagnosticsEngine::Error: OS.changeColor(savedColor, true); break; case DiagnosticsEngine::Error:
case DiagnosticsEngine::Fatal: OS.changeColor(savedColor, true); break; case DiagnosticsEngine::Fatal:
OS.changeColor(savedColor, true);
Bold = true;
break;
default: break; //don't bold notes default: break; //don't bold notes
} }
} }
if (Columns) if (Columns)
printWordWrapped(OS, Message, Columns, CurrentColumn); printWordWrapped(OS, Message, Columns, CurrentColumn, Bold);
else { else {
bool Normal = true; bool Normal = true;
applyTemplateHighlighting(OS, Message, Normal); applyTemplateHighlighting(OS, Message, Normal, Bold);
assert(Normal && "Formatting should have returned to normal"); assert(Normal && "Formatting should have returned to normal");
} }