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

TextEditor: Merge Base- and ThreadedSyntaxHighlighterRunner

Browse Source 
Change-Id: I38ad01a895eabba99b2e554f3ae9bef85f32bb3b
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
This commit is contained in:
David Schulz
2024-01-04 14:50:45 +01:00
parent 1db28206c0
commit f4b3b85fee
13 changed files with 119 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ public:
TextMarks m_marksCache; // Marks not owned
Utils::Guard m_modificationChangedGuard;
BaseSyntaxHighlighterRunner *m_highlighterRunner = nullptr;
SyntaxHighlighterRunner *m_highlighterRunner = nullptr;
};
MultiTextCursor TextDocumentPrivate::indentOrUnindent(const MultiTextCursor &cursors,
@@ -635,7 +635,7 @@ QTextDocument *TextDocument::document() const
return &d->m_document;
}
BaseSyntaxHighlighterRunner *TextDocument::syntaxHighlighterRunner() const
SyntaxHighlighterRunner *TextDocument::syntaxHighlighterRunner() const
{
return d->m_highlighterRunner;
}
@@ -917,14 +917,11 @@ void TextDocument::resetSyntaxHighlighter(const std::function<SyntaxHighlighter
if (d->m_highlighterRunner)
delete d->m_highlighterRunner;
static const QString value
= qtcEnvironmentVariable("QTC_USE_THREADED_HIGHLIGHTER", "TRUE").toUpper();
if (threaded && value == QLatin1String("TRUE")) {
d->m_highlighterRunner = new ThreadedSyntaxHighlighterRunner(creator, document());
return;
}
static const bool envValue
= qtcEnvironmentVariable("QTC_USE_THREADED_HIGHLIGHTER", "TRUE").toUpper()
== QLatin1String("TRUE");
d->m_highlighterRunner = new BaseSyntaxHighlighterRunner(creator, document());
d->m_highlighterRunner = new SyntaxHighlighterRunner(creator, document(), threaded && envValue);
}
void TextDocument::cleanWhitespace(const QTextCursor &cursor)