Display inline suppressions in XML output

cli/cppcheckexecutor.cpp

@@ -311,6 +311,33 @@ namespace {
             return mCtuInfo;
         }
 
+        void reportInlineSuppressions(const Suppressions &suppressions) const
+        {
+            const auto &suppressionList = suppressions.nomsg.getSuppressions();
+            const bool hasInline = std::any_of(suppressionList.cbegin(), suppressionList.cend(),
+                                               [](const SuppressionList::Suppression &s) {
+                return s.isInline;
+            });
+            if (!hasInline)
+                return;
+
+            auto &out = mErrorOutput ? *mErrorOutput : std::cerr;
+            out << "    <inline-suppressions>" << std::endl;
+
+            for (const auto &suppression : suppressionList) {
+                if (!suppression.isInline)
+                    continue;
+                const std::string msg =
+                    "        <suppression file=\"" + ErrorLogger::toxml(suppression.fileName) +
+                    "\" id=\"" + suppression.errorId +
+                    "\" lineNumber=\"" + std::to_string(suppression.lineNumber) +
+                    "\"/>";
+                out << msg << std::endl;
+            }
+
+            out << "    </inline-suppressions>" << std::endl;
+        }
+
     private:
         /**
          * Information about progress is directed here. This should be
@@ -509,8 +536,10 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
     stdLogger.writeCheckersReport(supprs);
 
     if (settings.outputFormat == Settings::OutputFormat::xml) {
-        if (settings.xml_version == 3)
+        if (settings.xml_version == 3) {
             stdLogger.reportMetrics();
+            stdLogger.reportInlineSuppressions(cppcheck.getSuppressions());
+        }
         stdLogger.reportErr(ErrorMessage::getXMLFooter(settings.xml_version));
     }
 

lib/cppcheck.cpp

@@ -2121,6 +2121,11 @@ void CppCheck::printTimerResults(SHOWTIME_MODES mode)
     s_timerResults.showResults(mode);
 }
 
+const Suppressions &CppCheck::getSuppressions() const
+{
+    return mSuppressions;
+}
+
 bool CppCheck::isPremiumCodingStandardId(const std::string& id) const {
     if (mSettings.premiumArgs.find("--misra") != std::string::npos) {
         if (startsWith(id, "misra-") || startsWith(id, "premium-misra-"))

lib/cppcheck.h

@@ -139,6 +139,8 @@ class CPPCHECKLIB CppCheck {
     static void resetTimerResults();
     static void printTimerResults(SHOWTIME_MODES mode);
 
+    const Suppressions &getSuppressions() const;
+
 private:
     void purgedConfigurationMessage(const std::string &file, const std::string& configuration);
 

test/cli/inline-suppress_test.py

@@ -456,4 +456,44 @@ def test_unmatched_cfg():
         '{}cfg.c:14:0: information: Unmatched suppression: id [unmatchedSuppression]'.format(__proj_inline_suppres_path),
     ]
     assert stdout == ''
-    assert ret == 0, stdout
+    assert ret == 0, stdout
+
+def test_xml_report_stdout(tmpdir):
+    args = [
+        '-q',
+        '--inline-suppr',
+        '--xml-version=3',
+        f'{__proj_inline_suppres_path}template.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    lines = stderr.splitlines()
+
+    assert ret == 0
+    assert stdout == ''
+
+    assert '    <inline-suppressions>' in lines
+    assert f'        <suppression file="{__proj_inline_suppres_path}template.cpp" id="unusedFunction" lineNumber="9"/>' in lines
+    assert '    </inline-suppressions>' in lines
+
+def test_xml_report_file(tmpdir):
+    output_file = os.path.join(tmpdir, "results.xml")
+    args = [
+        '-q',
+        '--inline-suppr',
+        '--xml-version=3',
+        f'--output-file={output_file}',
+        f'{__proj_inline_suppres_path}template.cpp'
+    ]
+
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+
+    assert ret == 0
+    assert stdout == ''
+
+    with open(output_file, 'r') as file:
+        xml = file.read()
+
+    assert '    <inline-suppressions>' in xml
+    assert f'        <suppression file="{__proj_inline_suppres_path}template.cpp" id="unusedFunction" lineNumber="9"/>' in xml
+    assert '    </inline-suppressions>' in xml