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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
This commit is contained in:
Eike Ziller
2022-03-11 09:50:48 +01:00
parent a863958aa4 2829412e15
commit cd8c4ced81
184 changed files with 3566 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/plugins/projectexplorer/customparser.cpp
View File

@@ -271,7 +271,7 @@ OutputLineParser::Result CustomParser::parseLine(
CustomParserExpression::CustomParserChannel channel
)
{
const QString line = rawLine.trimmed();
const QString line = rightTrimmed(rawLine);
const Result res = hasMatch(line, channel, m_error, Task::Error);
if (res.status != Status::NotHandled)
return res;
@@ -629,6 +629,55 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data()
<< QString() << QString()
<< Tasks({CompileTask(Task::Error, unitTestMessage, unitTestFileName, unitTestLineNumber)})
<< QString();
const QString leadingSpacesPattern = "^ MESSAGE:(.+)";
const QString leadingSpacesMessage = " MESSAGE:Error";
const QString noLeadingSpacesMessage = "MESSAGE:Error";
QTest::newRow("leading spaces: match")
<< leadingSpacesMessage
<< QString()
<< OutputParserTester::STDOUT
<< CustomParserExpression::ParseBothChannels
<< CustomParserExpression::ParseBothChannels
<< leadingSpacesPattern << 2 << 3 << 1
<< QString() << 1 << 2 << 3
<< QString() << QString()
<< Tasks({CompileTask(Task::Error, "Error", {}, -1)})
<< QString();
QTest::newRow("leading spaces: no match")
<< noLeadingSpacesMessage
<< QString()
<< OutputParserTester::STDOUT
<< CustomParserExpression::ParseBothChannels
<< CustomParserExpression::ParseBothChannels
<< leadingSpacesPattern << 2 << 3 << 1
<< QString() << 1 << 2 << 3
<< (noLeadingSpacesMessage + '\n') << QString()
<< Tasks()
<< QString();
const QString noLeadingSpacesPattern = "^MESSAGE:(.+)";
QTest::newRow("no leading spaces: match")
<< noLeadingSpacesMessage
<< QString()
<< OutputParserTester::STDOUT
<< CustomParserExpression::ParseBothChannels
<< CustomParserExpression::ParseBothChannels
<< noLeadingSpacesPattern << 2 << 3 << 1
<< QString() << 1 << 2 << 3
<< QString() << QString()
<< Tasks({CompileTask(Task::Error, "Error", {}, -1)})
<< QString();
QTest::newRow("no leading spaces: no match")
<< leadingSpacesMessage
<< QString()
<< OutputParserTester::STDOUT
<< CustomParserExpression::ParseBothChannels
<< CustomParserExpression::ParseBothChannels
<< noLeadingSpacesPattern << 3 << 2 << 1
<< QString() << 1 << 2 << 3
<< (leadingSpacesMessage + '\n') << QString()
<< Tasks()
<< QString();
}
void ProjectExplorerPlugin::testCustomOutputParsers()