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

Revert "Revert "TextEditor: Use synchronous highlighter by default""

Browse Source 
The crash in the syntax highlighter was resolved so we can switch the
default back to synchronous highlighter.

This reverts commit 0539e2a0f6.

Change-Id: I2e9cdb818420a14d01565d58def14f88cf5e895d
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
This commit is contained in:
David Schulz
2024-03-07 07:30:30 +01:00
parent 2cf2843b38
commit 876159cea9
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/textdocument.cpp
View File

@@ -914,19 +914,23 @@ bool TextDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type
void TextDocument::resetSyntaxHighlighter(const std::function<SyntaxHighlighter *()> &creator, void TextDocument::resetSyntaxHighlighter(const std::function<SyntaxHighlighter *()> &creator,
bool threaded) bool threaded)
{ {
if (d->m_highlighterRunner) delete d->m_highlighterRunner;
delete d->m_highlighterRunner;
static const bool envValue static const std::optional<bool> envValue = []() -> std::optional<bool> {
= qtcEnvironmentVariable("QTC_USE_THREADED_HIGHLIGHTER", "TRUE").toUpper() const QString key("QTC_USE_THREADED_HIGHLIGHTER");
== QLatin1String("TRUE"); if (qtcEnvironmentVariableIsSet(key)) {
const QString value = qtcEnvironmentVariable(key).toUpper();
return value != "FALSE" && value != "0";
}
return {};
}();
SyntaxHighlighter *highlighter = creator(); SyntaxHighlighter *highlighter = creator();
highlighter->setFontSettings(TextEditorSettings::fontSettings()); highlighter->setFontSettings(TextEditorSettings::fontSettings());
highlighter->setMimeType(mimeType()); highlighter->setMimeType(mimeType());
d->m_highlighterRunner = new SyntaxHighlighterRunner(highlighter, d->m_highlighterRunner = new SyntaxHighlighterRunner(highlighter,
document(), document(),
threaded && envValue); envValue.value_or(threaded));
} }
void TextDocument::cleanWhitespace(const QTextCursor &cursor) void TextDocument::cleanWhitespace(const QTextCursor &cursor)

2
src/plugins/texteditor/textdocument.h
View File

@@ -127,7 +127,7 @@ public:
QTextDocument *document() const; QTextDocument *document() const;
using SyntaxHighLighterCreator = std::function<SyntaxHighlighter *()>; using SyntaxHighLighterCreator = std::function<SyntaxHighlighter *()>;
void resetSyntaxHighlighter(const SyntaxHighLighterCreator &creator, bool threaded = true); void resetSyntaxHighlighter(const SyntaxHighLighterCreator &creator, bool threaded = false);
SyntaxHighlighterRunner *syntaxHighlighterRunner() const; SyntaxHighlighterRunner *syntaxHighlighterRunner() const;
bool reload(QString *errorString, QTextCodec *codec); bool reload(QString *errorString, QTextCodec *codec);