walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Addons; allow multiple locations in addon error message

This commit is contained in:
Daniel Marjamäki 2021-10-11 22:07:03 +02:00
parent 66a734b481
commit 935c9349f3
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/cppcheck.cpp
View File

@ -1361,13 +1361,23 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
picojson::object obj = res.get<picojson::object>(); picojson::object obj = res.get<picojson::object>();
const std::string fileName = obj["file"].get<std::string>();
const int64_t lineNumber = obj["linenr"].get<int64_t>();
const int64_t column = obj["column"].get<int64_t>();
ErrorMessage errmsg; ErrorMessage errmsg;
errmsg.callStack.emplace_back(ErrorMessage::FileLocation(fileName, lineNumber, column)); if (obj.count("file") > 0) {
const std::string fileName = obj["file"].get<std::string>();
const int64_t lineNumber = obj["linenr"].get<int64_t>();
const int64_t column = obj["column"].get<int64_t>();
errmsg.callStack.emplace_back(ErrorMessage::FileLocation(fileName, lineNumber, column));
} else if (obj.count("loc") > 0) {
for (const picojson::value &locvalue: obj["loc"].get<picojson::array>()) {
picojson::object loc = locvalue.get<picojson::object>();
const std::string fileName = loc["file"].get<std::string>();
const int64_t lineNumber = loc["linenr"].get<int64_t>();
const int64_t column = loc["column"].get<int64_t>();
const std::string info = loc["info"].get<std::string>();
errmsg.callStack.emplace_back(ErrorMessage::FileLocation(fileName, info, lineNumber, column));
}
}
errmsg.id = obj["addon"].get<std::string>() + "-" + obj["errorId"].get<std::string>(); errmsg.id = obj["addon"].get<std::string>() + "-" + obj["errorId"].get<std::string>();
const std::string text = obj["message"].get<std::string>(); const std::string text = obj["message"].get<std::string>();
@ -1376,7 +1386,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
errmsg.severity = Severity::fromString(severity); errmsg.severity = Severity::fromString(severity);
if (errmsg.severity == Severity::SeverityType::none) if (errmsg.severity == Severity::SeverityType::none)
continue; continue;
errmsg.file0 = fileName; errmsg.file0 = ((files.size() == 1) ? files[0] : "");
reportErr(errmsg); reportErr(errmsg);
} }