feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakePM: Include the last error/warning line from call stack

Browse Source 
This was the first one reported by CMake, and we need to make sure it's
also included.

Change-Id: I5becfffc1afb35a4f69fd26d8563aa1ea6eaea60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-10-05 17:42:25 +02:00
parent 224b409013
commit 9ab9c88e0a
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cmakeprojectmanager/cmakeparser.cpp
View File

@@ -93,6 +93,11 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
LinkSpecs linkSpecs;
addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line,
match, 1);
m_errorOrWarningLine.file = m_lastTask.file;
m_errorOrWarningLine.line = m_lastTask.line;
m_errorOrWarningLine.function = match.captured(3);
return {Status::InProgress, linkSpecs};
}
match = m_nextSubError.match(trimmedLine);
@@ -116,6 +121,11 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
LinkSpecs linkSpecs;
addLinkSpecForAbsoluteFilePath(linkSpecs, m_lastTask.file, m_lastTask.line,
match, 1);
m_errorOrWarningLine.file = m_lastTask.file;
m_errorOrWarningLine.line = m_lastTask.line;
m_errorOrWarningLine.function = match.captured(4);
return {Status::InProgress, linkSpecs};
}
else if (trimmedLine.startsWith(QLatin1String(" ")) && !m_lastTask.isNull() && !m_callStack) {
@@ -203,6 +213,8 @@ void CMakeParser::flush()
m_lastTask.details << tr("Call stack:");
m_lines += 2;
m_callStack->push_front(m_errorOrWarningLine);
int offset = m_lastTask.details.join('\n').size();
Utils::reverseForeach(m_callStack.value(), [&](const auto &line) {
const QString fileAndLine = QString("%1:%2").arg(line.file.path()).arg(line.line);
@@ -439,7 +451,9 @@ void Internal::CMakeProjectPlugin::testCMakeParser_data()
" /Qt/6.5.3/mingw_64/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:741 "
"(qt6_add_executable)\n"
" /Qt/6.5.3/mingw_64/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:549 "
"(_qt_internal_create_executable)",
"(_qt_internal_create_executable)\n"
" /Qt/6.5.3/mingw_64/lib/cmake/Qt6Core/Qt6CoreMacros.cmake:588 "
"(add_executable)",
FilePath::fromUserInput("/Projects/Test-Project/CMakeLists.txt"),
13))
<< QString();