feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Filter adjacent carriage returns in OutputFormatter

Browse Source 
It shouldn't change the semantics, and it helps on some systems with
strange line endings.

Fixes: QTCREATORBUG-24556
Change-Id: I8158ddda458e5500bce6ce7b9ff4d5d981f88d7d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-30 15:11:30 +01:00
parent 7048a89fa1
commit cb2a241e02
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/synchronousprocess.cpp
View File

@@ -39,6 +39,7 @@
#include <QApplication> #include <QApplication>
#include <algorithm>
#include <limits.h> #include <limits.h>
#include <memory> #include <memory>
@@ -803,7 +804,11 @@ QString SynchronousProcess::locateBinary(const QString &path, const QString &bin
QString SynchronousProcess::normalizeNewlines(const QString &text) QString SynchronousProcess::normalizeNewlines(const QString &text)
{ {
QString res = text; QString res = text;
res.replace(QLatin1String("\r\n"), QLatin1String("\n")); const auto newEnd = std::unique(res.begin(), res.end(), [](const QChar &c1, const QChar &c2) {
return c1 == '\r' && c2 == '\r'; // QTCREATORBUG-24556
});
res.chop(std::distance(newEnd, res.end()));
res.replace("\r\n", "\n");
return res; return res;
} }

2
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -627,7 +627,7 @@ private:
void Internal::CorePlugin::testOutputFormatter() void Internal::CorePlugin::testOutputFormatter()
{ {
const QString input = const QString input =
"B to be handled by B\r\n" "B to be handled by B\r\r\n"
"not to be handled\n\n\n\n" "not to be handled\n\n\n\n"
"A to be handled by A\n" "A to be handled by A\n"
"continuation for A\r\n" "continuation for A\r\n"