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

Utils: Allow highlighting to be done asynchronously

Browse Source 
Change-Id: Ief0e1ba2e2c32b6ad112f4adc9b582b03a521fad
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-10-10 11:05:10 +02:00
parent 41473eadd8
commit ce9638d64c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/textutils.cpp
View File

@@ -4,6 +4,7 @@
#include "textutils.h" #include "textutils.h"
#include "qtcassert.h" #include "qtcassert.h"
#include <QPromise>
#include <QRegularExpression> #include <QRegularExpression>
#include <QTextBlock> #include <QTextBlock>
#include <QTextDocument> #include <QTextDocument>
@@ -299,14 +300,20 @@ static HighlightCallback &codeHighlighter()
return s_highlighter; return s_highlighter;
} }
QTextDocument *highlightCode(const QString &code, const QString &mimeType) QFuture<QTextDocument *> highlightCode(const QString &code, const QString &mimeType)
{ {
if (const auto highlighter = codeHighlighter()) if (const auto highlighter = codeHighlighter())
return highlighter(code, mimeType); return highlighter(code, mimeType);
QTextDocument *doc = new QTextDocument; QTextDocument *doc = new QTextDocument;
doc->setPlainText(code); doc->setPlainText(code);
return doc;
QPromise<QTextDocument *> promise;
promise.start();
promise.addResult(doc);
promise.finish();
return promise.future();
} }
void setCodeHighlighter(const HighlightCallback &highlighter) void setCodeHighlighter(const HighlightCallback &highlighter)

6
src/libs/utils/textutils.h
View File

@@ -5,6 +5,7 @@
#include "utils_global.h" #include "utils_global.h"
#include <QFuture>
#include <QMetaType> #include <QMetaType>
#include <QString> #include <QString>
@@ -84,8 +85,9 @@ QTCREATOR_UTILS_EXPORT QString utf16LineTextInUtf8Buffer(const QByteArray &utf8B
QTCREATOR_UTILS_EXPORT QDebug &operator<<(QDebug &stream, const Position &pos); QTCREATOR_UTILS_EXPORT QDebug &operator<<(QDebug &stream, const Position &pos);
using HighlightCallback = std::function<QTextDocument *(const QString &, const QString &)>; using HighlightCallback = std::function<QFuture<QTextDocument *>(const QString &, const QString &)>;
QTCREATOR_UTILS_EXPORT QTextDocument *highlightCode(const QString &code, const QString &mimeType); QTCREATOR_UTILS_EXPORT QFuture<QTextDocument *> highlightCode(
const QString &code, const QString &mimeType);
QTCREATOR_UTILS_EXPORT void setCodeHighlighter(const HighlightCallback &highlighter); QTCREATOR_UTILS_EXPORT void setCodeHighlighter(const HighlightCallback &highlighter);
} // Text } // Text