diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-21 14:44:20 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-09-24 10:15:32 +0000 |
commit | 5cb74af1665fbb9a5c45dd907e824be6b8318f2d (patch) | |
tree | e0239a0fdfa70444d1ae9655b257f59f652f36fc /src/libs/utils/outputformatter.cpp | |
parent | 0158dfcfd2e26a1786d23e9374a8c84e5adc935b (diff) |
OutputFormatter: Prevent consecutive newlines from being ignored
Amends b0cad9e9c7.
Fixes: QTCREATORBUG-24668
Change-Id: I19a2ea71be91ded8f2c458537dae62a3021afe52
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/utils/outputformatter.cpp')
-rw-r--r-- | src/libs/utils/outputformatter.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index eb6e974dff..d711569e7a 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -287,6 +287,13 @@ void OutputFormatter::overridePostPrintAction(const PostPrintAction &postPrintAc void OutputFormatter::doAppendMessage(const QString &text, OutputFormat format) { QTextCharFormat charFmt = charFormat(format); + + // This might cause insertion of a newline character. + if (text.isEmpty()) { + append(text, charFmt); + return; + } + QList<FormattedText> formattedText = parseAnsi(text, charFmt); const QString cleanLine = std::accumulate(formattedText.begin(), formattedText.end(), QString(), [](const FormattedText &t1, const FormattedText &t2) { return t1.text + t2.text; }); |