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

Core: Prefer to split text chunks in OutputWindow at line breaks

Browse Source 
We want to minimize backtracking in OutputFormatter.

Change-Id: I114472d761ddbf0a2c3e6b42c87a531206fb1473
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-07-04 17:54:26 +02:00
parent 3fb37b1210
commit f0d125f35a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,12 +416,24 @@ void OutputWindow::handleNextOutputChunk()
{
QTC_ASSERT(!d->queuedOutput.isEmpty(), return);
auto &chunk = d->queuedOutput.first();
if (chunk.first.size() <= chunkSize) {
// We want to break off the chunks along line breaks, if possible.
// Otherwise we can get ugly temporary artifacts e.g. for ANSI escape codes.
int actualChunkSize = std::min(chunkSize, int(chunk.first.size()));
const int minEndPos = std::max(0, actualChunkSize - 1000);
for (int i = actualChunkSize - 1; i >= minEndPos; --i) {
if (chunk.first.at(i) == '\n') {
actualChunkSize = i + 1;
break;
}
}
if (actualChunkSize == chunk.first.size()) {
handleOutputChunk(chunk.first, chunk.second);
d->queuedOutput.removeFirst();
} else {
handleOutputChunk(chunk.first.left(chunkSize), chunk.second);
chunk.first.remove(0, chunkSize);
handleOutputChunk(chunk.first.left(actualChunkSize), chunk.second);
chunk.first.remove(0, actualChunkSize);
}
if (!d->queuedOutput.isEmpty())
d->queueTimer.start();