forked from qt-creator/qt-creator
054d7d65d2
Before, when all the data was finished, we called showDiff()
in main thread. This consisted of 2 parts:
1. Calculating some extra data and generating actual text
for UnifiedDiffEditor out of input data.
2. Calling setPlainText() with generated text.
For a really big diffs this could freeze the main thread for a
couple of seconds. Like e.g. 05c35356ab
(initial Creator import) - it contained 7 million characters,
part 1. took about 500 ms and part 2. took about 2.5 seconds.
This two tasks are now done in separate thread.
However, since we can't call TextEditorWidget::setPlainText()
directly from non-GUI thread, we create a separate
TextDocument object in the worker thread, fill it with
generated diff input and move the TextDocument object
into the main thread as a result of async computation.
In main thread we replace TextDocument object of the
TextEditorWidget with the one generated in other thread.
This replacement is very fast.
Change-Id: I49a717ced1dc2d5b8946e0fd6bee244b25071f35
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
// Copyright (C) 2016 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
|
|
|
|
#pragma once
|
|
|
|
#include "diffutils.h"
|
|
|
|
#include <utils/guard.h>
|
|
|
|
#include <QObject>
|
|
#include <QTextCharFormat>
|
|
#include <QTimer>
|
|
|
|
QT_FORWARD_DECLARE_CLASS(QMenu)
|
|
|
|
namespace Core { class IDocument; }
|
|
namespace TextEditor { class FontSettings; }
|
|
namespace Utils { class ProgressIndicator; }
|
|
|
|
namespace DiffEditor {
|
|
|
|
class ChunkSelection;
|
|
|
|
namespace Internal {
|
|
|
|
class DiffEditorDocument;
|
|
|
|
class DiffEditorWidgetController : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit DiffEditorWidgetController(QWidget *diffEditorWidget);
|
|
|
|
void setDocument(DiffEditorDocument *document);
|
|
DiffEditorDocument *document() const;
|
|
|
|
void jumpToOriginalFile(const QString &fileName, int lineNumber,
|
|
int columnNumber);
|
|
void setFontSettings(const TextEditor::FontSettings &fontSettings);
|
|
void addCodePasterAction(QMenu *menu, int fileIndex, int chunkIndex);
|
|
void addApplyAction(QMenu *menu, int fileIndex, int chunkIndex);
|
|
void addRevertAction(QMenu *menu, int fileIndex, int chunkIndex);
|
|
void addExtraActions(QMenu *menu, int fileIndex, int chunkIndex, const ChunkSelection &selection);
|
|
void updateCannotDecodeInfo();
|
|
void setBusyShowing(bool busy);
|
|
|
|
ChunkData chunkData(int fileIndex, int chunkIndex) const;
|
|
|
|
Utils::Guard m_ignoreChanges;
|
|
QList<FileData> m_contextFileData; // ultimate data to be shown
|
|
// contextLineCount taken into account
|
|
QTextCharFormat m_fileLineFormat;
|
|
QTextCharFormat m_chunkLineFormat;
|
|
QTextCharFormat m_leftLineFormat;
|
|
QTextCharFormat m_rightLineFormat;
|
|
QTextCharFormat m_leftCharFormat;
|
|
QTextCharFormat m_rightCharFormat;
|
|
|
|
private:
|
|
bool isInProgress() const;
|
|
void toggleProgress(bool wasInProgress);
|
|
|
|
void patch(bool revert, int fileIndex, int chunkIndex);
|
|
void sendChunkToCodePaster(int fileIndex, int chunkIndex);
|
|
bool chunkExists(int fileIndex, int chunkIndex) const;
|
|
bool fileNamesAreDifferent(int fileIndex) const;
|
|
|
|
void scheduleShowProgress();
|
|
void showProgress();
|
|
void hideProgress();
|
|
void onDocumentReloadFinished();
|
|
|
|
QWidget *m_diffEditorWidget = nullptr;
|
|
|
|
DiffEditorDocument *m_document = nullptr;
|
|
|
|
bool m_isBusyShowing = false;
|
|
Utils::ProgressIndicator *m_progressIndicator = nullptr;
|
|
QTimer m_timer;
|
|
};
|
|
|
|
class DiffEditorInput
|
|
{
|
|
public:
|
|
DiffEditorInput(DiffEditorWidgetController *controller);
|
|
QList<FileData> m_contextFileData;
|
|
QTextCharFormat *m_fileLineFormat = nullptr;
|
|
QTextCharFormat *m_chunkLineFormat = nullptr;
|
|
QTextCharFormat *m_leftLineFormat = nullptr;
|
|
QTextCharFormat *m_rightLineFormat = nullptr;
|
|
QTextCharFormat *m_leftCharFormat = nullptr;
|
|
QTextCharFormat *m_rightCharFormat = nullptr;
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace DiffEditor
|