add "Dir " prefix to directives for all report types

Author: ludviggunne

lib/errorlogger.cpp

@@ -1043,8 +1043,6 @@ std::string getGuideline(const std::string &errId, ReportType reportType,
     case ReportType::misraC2025:
         if (errId.rfind("misra-c20", 0) == 0 || errId.rfind("premium-misra-c-20", 0) == 0)
             guideline = errId.substr(errId.rfind('-') + 1);
-        if (errId.find("-dir-") != std::string::npos)
-            guideline = "Dir " + guideline;
         break;
     case ReportType::misraCpp2008:
         if (errId.rfind("misra-cpp-2008-", 0) == 0)
@@ -1058,19 +1056,21 @@ std::string getGuideline(const std::string &errId, ReportType reportType,
         break;
     }
 
+    const std::string prefix = errId.find("-dir-") != std::string::npos ? "Dir " : "";
+
     if (!guideline.empty())
-        return guideline;
+        return prefix + guideline;
 
     auto it = guidelineMapping.find(errId);
 
     if (it != guidelineMapping.cend())
-        return it->second;
+        return prefix + it->second;
 
     if (severity == Severity::error || severity == Severity::warning) {
         it = guidelineMapping.find("error");
 
         if (it != guidelineMapping.cend())
-            return it->second;
+            return prefix + it->second;
     }
 
     return "";