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

UnifiedDiffEditor: Move polishing selections into working thread

Browse Source 
In case of big commit (like 05c35356ab)
polishing selections took about 200 ms. Move this work into
thread to avoid extra 200 ms freeze of GUI thread.

Change-Id: If159e3f0869264f467c4c015f944a3054609f812
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-27 13:20:26 +02:00
parent 2f0ec75284
commit e67e2121a7
5 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -301,7 +301,7 @@ void UnifiedDiffEditorWidget::setDiff(const QList<FileData> &diffFileList)
QString UnifiedDiffData::setChunk(const DiffEditorInput &input, const ChunkData &chunkData,
bool lastChunk, int *blockNumber, int *charNumber,
QMap<int, QList<DiffSelection>> *selections)
DiffSelections *selections)
{
if (chunkData.contextChunk)
return QString();
@@ -537,6 +537,7 @@ UnifiedDiffOutput UnifiedDiffData::setDiff(QFutureInterface<void> &fi, int progr
}
output.diffText.replace('\r', ' ');
output.selections = SelectableTextEditorWidget::polishedSelections(output.selections);
return output;
}
@@ -568,7 +569,6 @@ void UnifiedDiffEditorWidget::showDiff()
for (int b = 0; block.isValid(); block = block.next(), ++b)
setFoldingIndent(block, result.foldingIndent.value(b, 3));
}
// TODO: this could probably be done in thread, too
setSelections(result.selections);
}
m_watcher.release()->deleteLater();