fix severity colorization

esp. information as red was disturbing.

Author: rurban

cli/cmdlineparser.cpp

@@ -1575,7 +1575,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
     // Default template format..
     if (mSettings.templateFormat.empty()) {
-        mSettings.templateFormat = "{bold}{file}:{line}:{column}: {red}{inconclusive:{magenta}}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";
+        mSettings.templateFormat = "{bold}{file}:{line}:{column}: {inconclusive:}{severity}:{inconclusive: inconclusive:}{default} {message} [{id}]{reset}\\n{code}";
         if (mSettings.templateLocation.empty())
             mSettings.templateLocation = "{bold}{file}:{line}:{column}: {dim}note:{reset} {info}\\n{code}";
     }

lib/errorlogger.cpp

@@ -620,7 +620,7 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
     // replace id with guideline if present
     // replace severity with classification if present
     const std::string idStr = guideline.empty() ? id : guideline;
-    const std::string severityStr = classification.empty() ? severityToString(severity) : classification;
+    std::string severityStr = classification.empty() ? coloredSeverityToString(severity) : classification;
 
     findAndReplace(result, "{id}", idStr);
 
@@ -632,6 +632,7 @@ std::string ErrorMessage::toString(bool verbose, const std::string &templateForm
         findAndReplace(result, replaceFrom, replaceWith);
         pos1 = result.find("{inconclusive:", pos1);
     }
+    replaceColors(severityStr);
     findAndReplace(result, "{severity}", severityStr);
     findAndReplace(result, "{cwe}", std::to_string(cwe.id));
     findAndReplace(result, "{message}", verbose ? mVerboseMessage : mShortMessage);

lib/errortypes.cpp

@@ -72,6 +72,31 @@ std::string severityToString(Severity severity)
     throw InternalError(nullptr, "Unknown severity");
 }
 
+std::string coloredSeverityToString(Severity severity)
+{
+    switch (severity) {
+    case Severity::none:
+        return "";
+    case Severity::error:
+        return "{red}error";
+    case Severity::warning:
+        return "{magenta}warning";
+    case Severity::style:
+        return "{bold}style";
+    case Severity::performance:
+        return "{bold}performance";
+    case Severity::portability:
+        return "{bold}portability";
+    case Severity::information:
+        return "{green}information";
+    case Severity::debug:
+        return "debug";
+    case Severity::internal:
+        return "internal";
+    }
+    throw InternalError(nullptr, "Unknown severity");
+}
+
 // TODO: bail out on invalid severity
 Severity severityFromString(const std::string& severity)
 {

lib/errortypes.h

@@ -120,6 +120,7 @@ enum class Severity : std::uint8_t {
 };
 
 CPPCHECKLIB std::string severityToString(Severity severity);
+CPPCHECKLIB std::string coloredSeverityToString(Severity severity);
 CPPCHECKLIB Severity severityFromString(const std::string &severity);
 
 struct CWE {

test/testerrorlogger.cpp

@@ -50,6 +50,7 @@ class TestErrorLogger : public TestFixture {
         TEST_CASE(ErrorMessageVerbose);
         TEST_CASE(ErrorMessageVerboseLocations);
         TEST_CASE(ErrorMessageFromInternalError);
+        TEST_CASE(ErrorMessageColorized);
         TEST_CASE(CustomFormat);
         TEST_CASE(CustomFormat2);
         TEST_CASE(CustomFormatLocations);
@@ -243,6 +244,34 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("L3 FIO42-C", msg.toString(true, format, ""));
     }
 
+    void ErrorMessageColorized() const {
+        const bool oDisableColors = gDisableColors;
+        gDisableColors = false;
+        setenv("CLICOLOR_FORCE", "1", 1);
+        std::list<ErrorMessage::FileLocation> locs = { };
+        {
+            ErrorMessage msg(std::move(locs), emptyString, Severity::error, "Programming error.\nVerbose error", "errorId",
+                             Certainty::normal);
+            ASSERT_EQUALS("{bold} \x1b[31merror: Programming error.", msg.toString(false, "{bold} {severity}: {message}", ""));
+        }
+        {
+            ErrorMessage msg(std::move(locs), emptyString, Severity::warning, "Programming warning.\nVerbose warning", "errorId",
+                             Certainty::normal);
+            ASSERT_EQUALS("{bold} \x1b[35mwarning: Programming warning.", msg.toString(false, "{bold} {severity}: {message}", ""));
+        }
+        {
+            ErrorMessage msg(std::move(locs), emptyString, Severity::style, "Style.\nVerbose style", "errorId", Certainty::normal);
+            ASSERT_EQUALS("{bold} \x1b[1mstyle: Style.", msg.toString(false, "{bold} {severity}: {message}", ""));
+        }
+        {
+            ErrorMessage msg(std::move(locs), emptyString, Severity::information, "Programming information.\nProgramming information",
+                             "errorId", Certainty::normal);
+            ASSERT_EQUALS("{bold} \x1b[32minformation: Programming information.", msg.toString(false, "{bold} {severity}: {message}", ""));
+        }
+        setenv("CLICOLOR_FORCE", "", 1);
+        gDisableColors = oDisableColors;
+    }
+
     void CustomFormat() const {
         std::list<ErrorMessage::FileLocation> locs(1, fooCpp5);
         ErrorMessage msg(std::move(locs), "", Severity::error, "Programming error.\nVerbose error", "errorId", Certainty::normal);

test/testmathlib.cpp

@@ -389,12 +389,12 @@ class TestMathLib : public TestFixture {
         SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
         SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
         {
-            constexpr MathLib::bigint i = 18446744073709551615;
+            constexpr MathLib::bigint i = 18446744073709551615ULL;
             ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
             ASSERT_EQUALS(i, MathLib::toBigNumber("18446744073709551615"));
         }
         {
-            constexpr MathLib::bigint i = -18446744073709551615;
+            constexpr MathLib::bigint i = -18446744073709551615ULL;
             ASSERT_EQUALS(i, MathLib::toBigNumber(std::to_string(i)));
             ASSERT_EQUALS(i, MathLib::toBigNumber("-18446744073709551615"));
         }
@@ -565,12 +565,12 @@ class TestMathLib : public TestFixture {
         SUPPRESS_WARNING_CLANG_PUSH("-Wimplicitly-unsigned-literal")
         SUPPRESS_WARNING_GCC_PUSH("-Woverflow")
         {
-            constexpr MathLib::biguint u = 18446744073709551615;
+            constexpr MathLib::biguint u = 18446744073709551615ULL;
             ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
             ASSERT_EQUALS(u, MathLib::toBigUNumber("18446744073709551615"));
         }
         {
-            constexpr MathLib::biguint u = -18446744073709551615;
+            constexpr MathLib::biguint u = -18446744073709551615ULL;
             ASSERT_EQUALS(u, MathLib::toBigUNumber(std::to_string(u)));
             ASSERT_EQUALS(u, MathLib::toBigUNumber("-18446744073709551615"));
         }