From 98ce70480aa6c8d07b32749b618f8d47e1c238a3 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 17 Apr 2020 14:03:26 +0200
Subject: [PATCH] Vcs: Fix output pane

Amends c0c2df203d.

Change-Id: I77d022f2b3a4d3cab4713d9cbd2bc66102ee58a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/coreplugin/outputwindow.cpp | 5 +++++
 src/plugins/coreplugin/outputwindow.h   | 6 +++++-
 src/plugins/vcsbase/vcsoutputwindow.cpp | 8 +++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp
index 1128dad377e..91504ff1a16 100644
--- a/src/plugins/coreplugin/outputwindow.cpp
+++ b/src/plugins/coreplugin/outputwindow.cpp
@@ -221,6 +221,11 @@ void OutputWindow::setLineParsers(const QList<OutputLineParser *> &parsers)
     d->formatter.setLineParsers(parsers);
 }
 
+OutputFormatter *OutputWindow::outputFormatter() const
+{
+    return &d->formatter;
+}
+
 void OutputWindow::showEvent(QShowEvent *e)
 {
     QPlainTextEdit::showEvent(e);
diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h
index 4e94d66af54..7bf300ebb95 100644
--- a/src/plugins/coreplugin/outputwindow.h
+++ b/src/plugins/coreplugin/outputwindow.h
@@ -34,7 +34,10 @@
 #include <QPlainTextEdit>
 #include <QTimer>
 
-namespace Utils { class OutputLineParser; }
+namespace Utils {
+class OutputFormatter;
+class OutputLineParser;
+}
 
 namespace Core {
 
@@ -57,6 +60,7 @@ public:
     ~OutputWindow() override;
 
     void setLineParsers(const QList<Utils::OutputLineParser *> &parsers);
+    Utils::OutputFormatter *outputFormatter() const;
 
     void appendMessage(const QString &out, Utils::OutputFormat format);
 
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index d600143d16a..30b80b28a1b 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -31,7 +31,6 @@
 #include <coreplugin/find/basetextfind.h>
 #include <coreplugin/outputwindow.h>
 #include <utils/fileutils.h>
-#include <utils/outputformatter.h>
 #include <utils/qtcprocess.h>
 #include <texteditor/behaviorsettings.h>
 #include <texteditor/fontsettings.h>
@@ -111,7 +110,6 @@ private:
     QString identifierUnderCursor(const QPoint &pos, QString *repository = nullptr) const;
 
     Utils::OutputFormat m_format;
-    Utils::OutputFormatter m_formatter;
     VcsOutputLineParser *m_parser = nullptr;
 };
 
@@ -121,7 +119,7 @@ OutputWindowPlainTextEdit::OutputWindowPlainTextEdit(QWidget *parent) :
     setReadOnly(true);
     setUndoRedoEnabled(false);
     setFrameStyle(QFrame::NoFrame);
-    m_formatter.setBoldFontEnabled(false);
+    outputFormatter()->setBoldFontEnabled(false);
     m_parser = new VcsOutputLineParser;
     setLineParsers({m_parser});
     auto agg = new Aggregation::Aggregate;
@@ -223,7 +221,7 @@ void OutputWindowPlainTextEdit::appendLines(const QString &s, const QString &rep
 
     const int previousLineCount = document()->lineCount();
 
-    m_formatter.appendMessage(s, m_format);
+    outputFormatter()->appendMessage(s, m_format);
 
     // Scroll down
     moveCursor(QTextCursor::End);
@@ -257,7 +255,7 @@ VcsOutputLineParser *OutputWindowPlainTextEdit::parser()
 
 void OutputWindowPlainTextEdit::setFormat(VcsOutputWindow::MessageStyle style)
 {
-    m_formatter.setBoldFontEnabled(style == VcsOutputWindow::Command);
+    outputFormatter()->setBoldFontEnabled(style == VcsOutputWindow::Command);
 
     switch (style) {
     case VcsOutputWindow::Warning: