Commit bb73d197 authored by Benjamin Kramer's avatar Benjamin Kramer
Browse files

SourceMgr: Colorize diagnostics. 

Same color scheme as clang uses. The colors are only enabled if the output is a tty.

llvm-svn: 155035
parent dba3f5be

llvm/include/llvm/Support/SourceMgr.h

+5 −2
Original line number Diff line number Diff line
@@ -128,8 +128,11 @@ public: 
  /// PrintMessage - Emit a message about the specified location with the

  /// specified string.

  ///

  /// @param ShowColors - Display colored messages if output is a terminal and

  /// the default error handler is used.

  void PrintMessage(SMLoc Loc, DiagKind Kind, const Twine &Msg,

                    ArrayRef<SMRange> Ranges = ArrayRef<SMRange>()) const;

                    ArrayRef<SMRange> Ranges = ArrayRef<SMRange>(),

                    bool ShowColors = true) const;





  /// GetMessage - Return an SMDiagnostic at the specified location with the
@@ -188,7 +191,7 @@ public: 
  const std::vector<std::pair<unsigned, unsigned> > &getRanges() const {

    return Ranges;

  }

  void print(const char *ProgName, raw_ostream &S) const;

  void print(const char *ProgName, raw_ostream &S, bool ShowColors = true) const;

};



}  // end llvm namespace

llvm/lib/Support/SourceMgr.cpp

+41 −7
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, SourceMgr::DiagKind Kind, 
}



void SourceMgr::PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind,

                             const Twine &Msg, ArrayRef<SMRange> Ranges) const {

                             const Twine &Msg, ArrayRef<SMRange> Ranges,

                             bool ShowColors) const {

  SMDiagnostic Diagnostic = GetMessage(Loc, Kind, Msg, Ranges);

  

  // Report the message with the diagnostic handler if present.
@@ -208,7 +209,7 @@ void SourceMgr::PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind, 
  assert(CurBuf != -1 && "Invalid or unspecified location!");

  PrintIncludeStack(getBufferInfo(CurBuf).IncludeLoc, OS);



  Diagnostic.print(0, OS);

  Diagnostic.print(0, OS, ShowColors);

}



//===----------------------------------------------------------------------===//
@@ -225,7 +226,14 @@ SMDiagnostic::SMDiagnostic(const SourceMgr &sm, SMLoc L, const std::string &FN, 
}





void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const {

void SMDiagnostic::print(const char *ProgName, raw_ostream &S,

                         bool ShowColors) const {

  // Display colors only if OS goes to a tty.

  ShowColors &= S.is_displayed();



  if (ShowColors)

    S.changeColor(raw_ostream::SAVEDCOLOR, true);



  if (ProgName && ProgName[0])

    S << ProgName << ": ";
@@ -244,13 +252,33 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const { 
  }



  switch (Kind) {

  case SourceMgr::DK_Error: S << "error: "; break;

  case SourceMgr::DK_Warning: S << "warning: "; break;

  case SourceMgr::DK_Note: S << "note: "; break;

  case SourceMgr::DK_Error:

    if (ShowColors)

      S.changeColor(raw_ostream::RED, true);

    S << "error: ";

    break;

  case SourceMgr::DK_Warning:

    if (ShowColors)

      S.changeColor(raw_ostream::MAGENTA, true);

    S << "warning: ";

    break;

  case SourceMgr::DK_Note:

    if (ShowColors)

      S.changeColor(raw_ostream::BLACK, true);

    S << "note: ";

    break;

  }



  if (ShowColors) {

    S.resetColor();

    S.changeColor(raw_ostream::SAVEDCOLOR, true);

  }



  S << Message << '\n';



  if (ShowColors)

    S.resetColor();



  if (LineNo == -1 || ColumnNo == -1)

    return;
@@ -292,6 +320,9 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const { 
  }

  S << '\n';



  if (ShowColors)

    S.changeColor(raw_ostream::GREEN, true);



  // Print out the caret line, matching tabs in the source line.

  for (unsigned i = 0, e = CaretLine.size(), OutCol = 0; i != e; ++i) {

    if (i >= LineContents.size() || LineContents[i] != '\t') {
@@ -307,6 +338,9 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const { 
    } while (OutCol & 7);

  }



  if (ShowColors)

    S.resetColor();

  

  S << '\n';

}