2 files changed, 16 insertions, 3 deletions
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 34c76d3ce6..49cb31d3e5 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -216,6 +216,7 @@ public:
     PostPrintAction postPrintAction;
     bool boldFontEnabled = true;
     bool prependCarriageReturn = false;
+    bool prependLineFeed = false;
 };
 
 OutputFormatter::OutputFormatter() : d(new Private) { }
@@ -436,6 +437,7 @@ void OutputFormatter::append(const QString &text, const QTextCharFormat &format)
         d->cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
         startPos = crPos + 1;
     }
+    flushTrailingNewline();
     if (startPos < text.count())
         d->cursor.insertText(text.mid(startPos), format);
 }
@@ -495,6 +497,14 @@ void OutputFormatter::flushIncompleteLine()
     d->incompleteLine.first.clear();
 }
 
+void Utils::OutputFormatter::flushTrailingNewline()
+{
+    if (d->prependLineFeed) {
+        d->cursor.insertText("\n");
+        d->prependLineFeed = false;
+    }
+}
+
 void OutputFormatter::dumpIncompleteLine(const QString &line, OutputFormat format)
 {
     if (line.isEmpty())
@@ -560,6 +570,7 @@ void OutputFormatter::flush()
 {
     if (!d->incompleteLine.first.isEmpty())
         flushIncompleteLine();
+    flushTrailingNewline();
     d->escapeCodeHandler.endFormatScope();
     for (OutputLineParser * const p : qAsConst(d->lineParsers))
         p->flush();
@@ -641,7 +652,8 @@ void OutputFormatter::appendMessage(const QString &text, OutputFormat format)
             dumpIncompleteLine(out.mid(startPos), format);
             break;
         }
-        doAppendMessage(out.mid(startPos, eolPos - startPos + 1), format);
+        doAppendMessage(out.mid(startPos, eolPos - startPos), format);
+        d->prependLineFeed = true;
         startPos = eolPos + 1;
     }
 }
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 6c8539d3ed..f9bcb145c3 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -83,8 +83,8 @@ public:
     void setDemoteErrorsToWarnings(bool demote);
     bool demoteErrorsToWarnings() const;
 
-    // line contains at most one line feed character, and if it does occur, it's the last character.
-    // Either way, the input is to be considered "complete" for parsing purposes.
+    // Represents a single line, without a trailing line feed character.
+    // The input is to be considered "complete" for parsing purposes.
     virtual Result handleLine(const QString &line, OutputFormat format) = 0;
 
     virtual bool handleLink(const QString &href) { Q_UNUSED(href); return false; }
@@ -183,6 +183,7 @@ private:
     void append(const QString &text, const QTextCharFormat &format);
     void initFormats();
     void flushIncompleteLine();
+    void flushTrailingNewline();
     void dumpIncompleteLine(const QString &line, OutputFormat format);
     void clearLastLine();
     QList<FormattedText> parseAnsi(const QString &text, const QTextCharFormat &format);