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

QtSupport: Make qmlcachegen/qmlsc/qmllint issues clickable

Browse Source 
Various qml-related issues end up in the issues view since recently.
This change parses the output a bit more and makes the issues
"clickable".

Fixes: QTCREATORBUG-27762
Change-Id: Id6d2a0db8c49336125428488b75e96677f783342
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2023-06-20 19:34:19 +02:00
parent 6a9f9358c5
commit c4619ca9de
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/plugins/qtsupport/qtparser.cpp
View File

@@ -19,12 +19,13 @@ using namespace ProjectExplorer;
namespace QtSupport { namespace QtSupport {
// opt. drive letter + filename: (2 brackets) // opt. drive letter + filename: (2 brackets)
#define FILE_PATTERN R"(^(?<file>(?:[A-Za-z]:)?[^:\(]+\.[^:\(]+))" #define FILE_PATTERN R"((?<file>(?:[A-Za-z]:)?[^:\(]+\.[^:\(]+))"
QtParser::QtParser() : QtParser::QtParser() :
m_mocRegExp(FILE_PATTERN R"([:\(](?<line>\d+)?(?::(?<column>\d+))?\)?:\s(?<level>[Ww]arning|[Ee]rror|[Nn]ote):\s(?<description>.+?)$)"), m_mocRegExp("^" FILE_PATTERN R"([:\(](?<line>\d+)?(?::(?<column>\d+))?\)?:\s(?<level>[Ww]arning|[Ee]rror|[Nn]ote):\s(?<description>.+?)$)"),
m_uicRegExp(FILE_PATTERN R"(: Warning:\s(?<msg>.+?)$)"), m_uicRegExp("^" FILE_PATTERN R"(: Warning:\s(?<msg>.+?)$)"),
m_translationRegExp(R"(^(?<level>[Ww]arning|[Ee]rror):\s+(?<description>.*?) in '(?<file>.*?)'$)") m_translationRegExp(R"(^(?<level>[Ww]arning|[Ee]rror):\s+(?<description>.*?) in '(?<file>.*?)'$)"),
m_qmlToolsRegExp(R"(^(?<level>Warning|Error):\s*)" FILE_PATTERN R"([:\(](?<line>\d+)?(?::(?<column>\d+))?\)?:\s(?<description>.+?)$)")
{ {
setObjectName(QLatin1String("QtParser")); setObjectName(QLatin1String("QtParser"));
} }
@@ -89,19 +90,22 @@ Utils::OutputLineParser::Result QtParser::handleLine(const QString &line, Utils:
scheduleTask(task, 1); scheduleTask(task, 1);
return {Status::Done, linkSpecs}; return {Status::Done, linkSpecs};
} }
match = m_qmlToolsRegExp.match(line);
if (lne.startsWith(QLatin1String("Error:"))) { if (match.hasMatch()) {
constexpr int matchLength = 6; const Task::TaskType type = match.captured("level") == "Error" ? Task::Error
CompileTask task(Task::TaskType::Error, line.mid(matchLength).trimmed()); : Task::Warning;
const Utils::FilePath file
= absoluteFilePath(Utils::FilePath::fromUserInput(match.captured("file")));
bool ok;
int lineno = match.captured("line").toInt(&ok);
if (!ok)
lineno = -1;
LinkSpecs linkSpecs;
addLinkSpecForAbsoluteFilePath(linkSpecs, file, lineno, match, "file");
CompileTask task(type, match.captured("description"), file, lineno,
match.captured("column").toInt());
scheduleTask(task, 1); scheduleTask(task, 1);
return Status::Done; return {Status::Done, linkSpecs};
}
if (lne.startsWith(QLatin1String("Warning:"))) {
constexpr int matchLength = 8;
CompileTask task(Task::TaskType::Warning, line.mid(matchLength).trimmed());
scheduleTask(task, 1);
return Status::Done;
} }
return Status::NotHandled; return Status::NotHandled;
@@ -220,15 +224,22 @@ void QtSupportPlugin::testQtOutputParser_data()
QLatin1String("dropping duplicate messages"), QLatin1String("dropping duplicate messages"),
Utils::FilePath::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1)) Utils::FilePath::fromUserInput(QLatin1String("/some/place/qtcreator_fr.qm")), -1))
<< QString(); << QString();
QTest::newRow("qmlsc warning") // QTCREATORBUG-28720 QTest::newRow("qmlsc/qmllint warning") // QTCREATORBUG-28720
<< QString::fromUtf8("Warning: Main.qml:4:1: Warnings occurred while importing module " << QString::fromLatin1("Warning: Main.qml:4:1: Warnings occurred while importing module "
"\"QtQuick.Controls\": [import]\"") "\"QtQuick.Controls\": [import]\"")
<< OutputParserTester::STDERR << QString() << QString() << OutputParserTester::STDERR << QString() << QString()
<< (Tasks() << CompileTask(Task::Warning, << (Tasks() << CompileTask(Task::Warning,
QString::fromUtf8( "Warnings occurred while importing module \"QtQuick.Controls\": [import]\"",
"Main.qml:4:1: Warnings occurred while importing module " Utils::FilePath::fromUserInput("Main.qml"), 4, 1))
"\"QtQuick.Controls\": [import]\""))) << QString();
<< QString(); QTest::newRow("qmlsc/qmllint error") // QTCREATORBUG-28720
<< QString::fromLatin1("Error: E:/foo/PerfProfilerFlameGraphView.qml:10:5: "
"Could not compile binding for model: Cannot resolve property type for binding on model")
<< OutputParserTester::STDERR << QString() << QString()
<< (Tasks() << CompileTask(Task::Error,
"Could not compile binding for model: Cannot resolve property type for binding on model",
Utils::FilePath::fromUserInput("E:/foo/PerfProfilerFlameGraphView.qml"), 10, 5))
<< QString();
} }
void QtSupportPlugin::testQtOutputParser() void QtSupportPlugin::testQtOutputParser()

1
src/plugins/qtsupport/qtparser.h
View File

@@ -25,6 +25,7 @@ private:
QRegularExpression m_mocRegExp; QRegularExpression m_mocRegExp;
QRegularExpression m_uicRegExp; QRegularExpression m_uicRegExp;
QRegularExpression m_translationRegExp; QRegularExpression m_translationRegExp;
const QRegularExpression m_qmlToolsRegExp;
}; };
} // namespace QtSupport } // namespace QtSupport