Fix task positions in outputwindow

* fixed the task offset for tasks created directly by build steps * no longer clear output window for new build step * update task navigation by outputwindow to capture tasks from output parsers * qbs build steps now only report first task for failure * qbs build steps do not convert from path to string to path uselessly
hicknhack-software · Feb 25, 2022 · 1be86dd · 1be86dd
1 parent 22d4654
commit 1be86dd
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 46 deletions.
diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
@@ -91,6 +91,7 @@ class OutputWindowPrivate
     QTimer scrollTimer;
     QElapsedTimer lastMessage;
     QHash<unsigned int, QPair<int, int>> taskPositions;
+    int lineCount = 0; // correct line count to apply offsets
 };
 
 } // namespace Internal
@@ -494,6 +495,12 @@ void OutputWindow::appendMessage(const QString &output, OutputFormat format)
         d->queuedOutput.last().first.append(output);
     if (!d->queueTimer.isActive())
         d->queueTimer.start();
+
+    d->lineCount += output.count('\n');
+}
+
+int OutputWindow::directTaskOffset() const {
+    return document()->blockCount() - d->lineCount;
 }
 
 void OutputWindow::registerPositionOf(unsigned taskId, int linkedOutputLines, int skipLines,
@@ -507,6 +514,7 @@ void OutputWindow::registerPositionOf(unsigned taskId, int linkedOutputLines, in
     const int lastLine = firstLine + linkedOutputLines - 1;
 
     d->taskPositions.insert(taskId, qMakePair(firstLine, lastLine));
+    if (d->taskPositions.size() ==1) emit hasPositionsChanged();
 }
 
 bool OutputWindow::knowsPositionOf(unsigned taskId) const
@@ -628,7 +636,10 @@ void OutputWindow::clear()
 {
     d->formatter.clear();
     d->scrollToBottom = true;
+    auto hadTaskPositions = hasPositions();
     d->taskPositions.clear();
+    d->lineCount = 0;
+    if (hadTaskPositions) emit hasPositionsChanged();
 }
 
 void OutputWindow::flush()
@@ -650,8 +661,7 @@ void OutputWindow::reset()
 {
     flush();
     d->queueTimer.stop();
-    d->formatter.reset();
-    d->scrollToBottom = true;
+    clear();
     if (!d->queuedOutput.isEmpty()) {
         d->queuedOutput.clear();
         d->formatter.appendMessage(tr("[Discarding excessive amount of pending output.]\n"),

diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
@@ -62,6 +62,7 @@ class CORE_EXPORT OutputWindow : public QPlainTextEdit
 
     void appendMessage(const QString &out, Utils::OutputFormat format);
 
+    int directTaskOffset() const;
     void registerPositionOf(unsigned taskId, int linkedOutputLines, int skipLines, int offset = 0);
     bool knowsPositionOf(unsigned taskId) const;
     void showPositionOf(unsigned taskId);
@@ -95,6 +96,7 @@ class CORE_EXPORT OutputWindow : public QPlainTextEdit
 
 signals:
     void wheelZoom();
+    void hasPositionsChanged();
 
 public slots:
     void setWordWrapEnabled(bool wrap);

diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
@@ -748,7 +748,8 @@ void BuildManager::nextStep()
         connect(d->m_currentBuildStep, &BuildStep::finished, instance(), finishedHandler);
         connect(d->m_currentBuildStep, &BuildStep::progress,
                 instance(), &BuildManager::progressChanged);
-        d->m_outputWindow->reset();
+        // d->m_outputWindow->reset();
+        d->m_outputWindow->outputFormatter()->reset();
         d->m_currentBuildStep->setupOutputFormatter(d->m_outputWindow->outputFormatter());
         d->m_currentBuildStep->run();
     } else {

diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp
@@ -81,6 +81,8 @@ CompileOutputWindow::CompileOutputWindow(QAction *cancelBuildAction) :
     m_outputWindow->setUndoRedoEnabled(false);
     m_outputWindow->setMaxCharCount(Core::Constants::DEFAULT_MAX_CHAR_COUNT);
 
+    connect(m_outputWindow, &Core::OutputWindow::hasPositionsChanged, this, &IOutputPane::navigateStateChanged);
+
     Utils::ProxyAction *cancelBuildProxyButton =
             Utils::ProxyAction::proxyActionWithIcon(cancelBuildAction,
                                                     Utils::Icons::STOP_SMALL_TOOLBAR.icon());
@@ -222,10 +224,9 @@ bool CompileOutputWindow::canNavigate() const
     return true;
 }
 
-void CompileOutputWindow::registerPositionOf(const Task &task, int linkedOutputLines, int skipLines,
-                                             int offset)
+void CompileOutputWindow::registerPositionOf(const Task &task, int linkedOutputLines, int skipLines)
 {
-    m_outputWindow->registerPositionOf(task.taskId, linkedOutputLines, skipLines, offset);
+    m_outputWindow->registerPositionOf(task.taskId, linkedOutputLines, skipLines, m_outputWindow->directTaskOffset());
 }
 
 void CompileOutputWindow::scrollToFirstTask()

diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -70,7 +70,7 @@ class CompileOutputWindow final : public Core::IOutputPane
 
     void appendText(const QString &text, BuildStep::OutputFormat format);
 
-    void registerPositionOf(const Task &task, int linkedOutputLines, int skipLines, int offset = 0);
+    void registerPositionOf(const Task &task, int linkedOutputLines, int skipLines);
     void scrollToFirstTask();
 
     void flush();

diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -432,12 +432,11 @@ void QbsBuildStep::buildingDone(const ErrorInfo &error)
     m_session->disconnect(this);
     m_session = nullptr;
     m_lastWasSuccess = !error.hasError();
-    for (const ErrorInfoItem &item : qAsConst(error.items)) {
-        createTaskAndOutput(
-                    ProjectExplorer::Task::Error,
-                    item.description,
-                    item.filePath.toString(),
-                    item.line);
+    bool isFirst = true;
+    for (const ErrorInfoItem &item : error.items) {
+        emit addOutput(item.description, OutputFormat::Stdout);
+        if (isFirst) emit addTask(CompileTask(Task::Error, item.description, item.filePath, item.line), 1);
+        isFirst = false;
     }
 
     // Building can uncover additional target artifacts.
@@ -505,13 +504,6 @@ void QbsBuildStep::handleProcessResult(
         emit addOutput(line, OutputFormat::Stdout);
 }
 
-void QbsBuildStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, const QString &message,
-                                       const QString &file, int line)
-{
-    emit addOutput(message, OutputFormat::Stdout);
-    emit addTask(CompileTask(type, message, FilePath::fromString(file), line), 1);
-}
-
 QString QbsBuildStep::buildVariant() const
 {
     return qbsConfiguration(PreserveVariables).value(Constants::QBS_CONFIG_VARIANT_KEY).toString();

diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h
@@ -99,9 +99,6 @@ class QbsBuildStep final : public ProjectExplorer::BuildStep
             const QStringList &stdErr,
             bool success);
 
-    void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
-                             const QString &message, const QString &file, int line);
-
     void setBuildVariant(const QString &variant);
     void setConfiguredArchitectures(const QStringList &architectures);
     QString profile() const;

diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -142,8 +142,13 @@ void QbsCleanStep::cleaningDone(const ErrorInfo &error)
     m_session->disconnect(this);
     m_session = nullptr;
 
-    for (const ErrorInfoItem &item : error.items)
-        createTaskAndOutput(Task::Error, item.description, item.filePath.toString(), item.line);
+    bool isFirst = true;
+    for (const ErrorInfoItem &item : error.items) {
+        emit addOutput(item.description, OutputFormat::Stdout);
+        if (isFirst) emit addTask(CompileTask(Task::Error, item.description, item.filePath, item.line), 1);
+        isFirst = false;
+    }
+
     emit finished(!error.hasError());
 }
 
@@ -159,12 +164,6 @@ void QbsCleanStep::handleProgress(int value)
         emit progress(value * 100 / m_maxProgress, m_description);
 }
 
-void QbsCleanStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, const QString &message, const QString &file, int line)
-{
-    emit addOutput(message, OutputFormat::Stdout);
-    emit addTask(CompileTask(type, message, Utils::FilePath::fromString(file), line), 1);
-}
-
 // --------------------------------------------------------------------
 // QbsCleanStepFactory:
 // --------------------------------------------------------------------

diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -59,9 +59,6 @@ class QbsCleanStep final : public ProjectExplorer::BuildStep
     void handleTaskStarted(const QString &desciption, int max);
     void handleProgress(int value);
 
-    void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
-                             const QString &message, const QString &file, int line);
-
     Utils::BoolAspect *m_dryRunAspect = nullptr;
     Utils::BoolAspect *m_keepGoingAspect = nullptr;
 

diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -139,8 +139,12 @@ void QbsInstallStep::installDone(const ErrorInfo &error)
     m_session->disconnect(this);
     m_session = nullptr;
 
-    for (const ErrorInfoItem &item : error.items)
-        createTaskAndOutput(Task::Error, item.description, item.filePath, item.line);
+    bool isFirst = true;
+    for (const ErrorInfoItem &item : error.items) {
+        emit addOutput(item.description, OutputFormat::Stdout);
+        if (isFirst) emit addTask(CompileTask(Task::Error, item.description, item.filePath, item.line), 1);
+        isFirst = false;
+    }
 
     emit finished(!error.hasError());
 }
@@ -157,13 +161,6 @@ void QbsInstallStep::handleProgress(int value)
         emit progress(value * 100 / m_maxProgress, m_description);
 }
 
-void QbsInstallStep::createTaskAndOutput(Task::TaskType type, const QString &message,
-                                         const Utils::FilePath &file, int line)
-{
-    emit addOutput(message, OutputFormat::Stdout);
-    emit addTask(CompileTask(type, message, file, line), 1);
-}
-
 QbsBuildStepData QbsInstallStep::stepData() const
 {
     QbsBuildStepData data;

diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -61,9 +61,6 @@ class QbsInstallStep final : public ProjectExplorer::BuildStep
     void handleTaskStarted(const QString &desciption, int max);
     void handleProgress(int value);
 
-    void createTaskAndOutput(ProjectExplorer::Task::TaskType type,
-                             const QString &message, const Utils::FilePath &file, int line);
-
     Utils::BoolAspect *m_cleanInstallRoot = nullptr;
     Utils::BoolAspect *m_dryRun = nullptr;
     Utils::BoolAspect *m_keepGoing = nullptr;