diff options
Diffstat (limited to 'src/plugins/projectexplorer/ioutputparser.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/ioutputparser.cpp | 201 |
1 files changed, 46 insertions, 155 deletions
diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp index 8dd6d99264..8c6e1c2b33 100644 --- a/src/plugins/projectexplorer/ioutputparser.cpp +++ b/src/plugins/projectexplorer/ioutputparser.cpp @@ -24,209 +24,100 @@ ****************************************************************************/ #include "ioutputparser.h" -#include "task.h" - -/*! - \class ProjectExplorer::IOutputParser - - \brief The IOutputParser class provides an interface for an output parser - that emits issues (tasks). - - \sa ProjectExplorer::Task -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::appendOutputParser(IOutputParser *parser) - Appends a subparser to this parser, of which IOutputParser will take - ownership. -*/ +#include "task.h" +#include "taskhub.h" -/*! - \fn IOutputParser *ProjectExplorer::IOutputParser::takeOutputParserChain() +#include <texteditor/fontsettings.h> +#include <texteditor/texteditorsettings.h> +#include <utils/ansiescapecodehandler.h> - Removes the appended outputparser chain from this parser, transferring - ownership of the parser chain to the caller. -*/ /*! - \fn IOutputParser *ProjectExplorer::IOutputParser::childParser() const + \class ProjectExplorer::OutputTaskParser - Returns the head of this parser's output parser children. IOutputParser - keeps ownership. -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::stdOutput(const QString &line) + \brief The OutputTaskParser class provides an interface for an output parser + that emits issues (tasks). - Called once for each line if standard output to parse. + \sa ProjectExplorer::Task */ /*! - \fn void ProjectExplorer::IOutputParser::stdError(const QString &line) + \fn ProjectExplorer::OutputTaskParser::Status ProjectExplorer::OutputTaskParser::handleLine(const QString &line, Utils::OutputFormat type) - Called once for each line if standard error to parse. + Called once for each line of standard output or standard error to parse. */ /*! - \fn bool ProjectExplorer::IOutputParser::hasFatalErrors() const + \fn bool ProjectExplorer::OutputTaskParser::hasFatalErrors() const This is mainly a Symbian specific quirk. */ /*! - \fn void ProjectExplorer::IOutputParser::addOutput(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) - - Should be emitted whenever some additional information should be added to the - output. - - \note This is additional information. There is no need to add each line. -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::addTask(const ProjectExplorer::Task &task) + \fn void ProjectExplorer::OutputTaskParser::addTask(const ProjectExplorer::Task &task) Should be emitted for each task seen in the output. */ /*! - \fn void ProjectExplorer::IOutputParser::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) - - Subparsers have their addOutput signal connected to this slot. -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) - - This function can be overwritten to change the string. -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::taskAdded(const ProjectExplorer::Task &task) - - Subparsers have their addTask signal connected to this slot. - This function can be overwritten to change the task. -*/ - -/*! - \fn void ProjectExplorer::IOutputParser::doFlush() + \fn void ProjectExplorer::OutputTaskParser::flush() Instructs a parser to flush its state. Parsers may have state (for example, because they need to aggregate several lines into one task). This function is called when this state needs to be flushed out to be visible. - - doFlush() is called by flush(). flush() is called on child parsers - whenever a new task is added. - It is also called once when all input has been parsed. */ namespace ProjectExplorer { -IOutputParser::~IOutputParser() -{ - delete m_parser; -} - -void IOutputParser::appendOutputParser(IOutputParser *parser) -{ - if (!parser) - return; - if (m_parser) { - m_parser->appendOutputParser(parser); - return; - } - - m_parser = parser; - connect(parser, &IOutputParser::addOutput, - this, &IOutputParser::outputAdded, Qt::DirectConnection); - connect(parser, &IOutputParser::addTask, - this, &IOutputParser::taskAdded, Qt::DirectConnection); -} - -IOutputParser *IOutputParser::takeOutputParserChain() +class OutputTaskParser::Private { - IOutputParser *parser = m_parser; - disconnect(parser, &IOutputParser::addOutput, this, &IOutputParser::outputAdded); - disconnect(parser, &IOutputParser::addTask, this, &IOutputParser::taskAdded); - m_parser = nullptr; - return parser; -} +public: + QList<TaskInfo> scheduledTasks; +}; -IOutputParser *IOutputParser::childParser() const -{ - return m_parser; -} +OutputTaskParser::OutputTaskParser() : d(new Private) { } -void IOutputParser::setChildParser(IOutputParser *parser) -{ - if (m_parser != parser) - delete m_parser; - m_parser = parser; - if (parser) { - connect(parser, &IOutputParser::addOutput, - this, &IOutputParser::outputAdded, Qt::DirectConnection); - connect(parser, &IOutputParser::addTask, - this, &IOutputParser::taskAdded, Qt::DirectConnection); - } -} +OutputTaskParser::~OutputTaskParser() { delete d; } -void IOutputParser::stdOutput(const QString &line) +const QList<OutputTaskParser::TaskInfo> OutputTaskParser::taskInfo() const { - if (m_parser) - m_parser->stdOutput(line); + return d->scheduledTasks; } -void IOutputParser::stdError(const QString &line) +void OutputTaskParser::scheduleTask(const Task &task, int outputLines, int skippedLines) { - if (m_parser) - m_parser->stdError(line); + TaskInfo ts(task, outputLines, skippedLines); + if (ts.task.type == Task::Error && demoteErrorsToWarnings()) + ts.task.type = Task::Warning; + d->scheduledTasks << ts; + QTC_CHECK(d->scheduledTasks.size() <= 2); } -void IOutputParser::outputAdded(const QString &string, BuildStep::OutputFormat format) +void OutputTaskParser::setDetailsFormat(Task &task, const LinkSpecs &linkSpecs) { - emit addOutput(string, format); -} - -void IOutputParser::taskAdded(const Task &task, int linkedOutputLines, int skipLines) -{ - emit addTask(task, linkedOutputLines, skipLines); -} - -void IOutputParser::doFlush() -{ } - -bool IOutputParser::hasFatalErrors() const -{ - return m_parser && m_parser->hasFatalErrors(); -} - -void IOutputParser::setWorkingDirectory(const QString &workingDirectory) -{ - if (m_parser) - m_parser->setWorkingDirectory(workingDirectory); -} - -void IOutputParser::setWorkingDirectory(const Utils::FilePath &fn) -{ - setWorkingDirectory(fn.toString()); -} + if (task.details.isEmpty()) + return; -void IOutputParser::flush() -{ - doFlush(); - if (m_parser) - m_parser->flush(); + Utils::FormattedText monospacedText(task.details.join('\n')); + monospacedText.format.setFont(TextEditor::TextEditorSettings::fontSettings().font()); + monospacedText.format.setFontStyleHint(QFont::Monospace); + const QList<Utils::FormattedText> linkifiedText = + Utils::OutputFormatter::linkifiedText({monospacedText}, linkSpecs); + task.formats.clear(); + int offset = task.summary.length() + 1; + for (const Utils::FormattedText &ft : linkifiedText) { + task.formats << QTextLayout::FormatRange{offset, ft.text.length(), ft.format}; + offset += ft.text.length(); + } } -QString IOutputParser::rightTrimmed(const QString &in) +void OutputTaskParser::runPostPrintActions() { - int pos = in.length(); - for (; pos > 0; --pos) { - if (!in.at(pos - 1).isSpace()) - break; - } - return in.mid(0, pos); + for (const TaskInfo &t : qAsConst(d->scheduledTasks)) + TaskHub::addTask(t.task); + d->scheduledTasks.clear(); } } // namespace ProjectExplorer |