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

TextEditor: Fix folding for async syntax highlighter

Browse Source 
- Made restoreState, ensureBlockIsUnfolded, fold, unfold and unfoldAll
functions to be called only after highlighting is done
- Improved management of foldValidator in async case
- Removed optimizations in cpphighlighter and glshighlighter.
The highlighters are async now and optimization is not necessary.
In these optimizations in the function highlightBlock the highlighting
changes not only for currentBlock but and for several next. Which is
contradict with the function name.

Change-Id: Ib413e6b982eb39d52f36c3066ff0fa8c28fbe231
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Artem Sokolovskii
2024-02-23 17:37:03 +01:00
parent 3f78592831
commit 95a5f01096
9 changed files with 92 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/texteditor/texteditor.cpp
View File

@@ -3492,13 +3492,35 @@ QByteArray TextEditorWidget::saveState() const
return state;
}
bool TextEditorWidget::singleShotAfterHighlightingDone(std::function<void()> &&f)
{
if (d->m_document->syntaxHighlighterRunner()
&& !d->m_document->syntaxHighlighterRunner()->syntaxInfoUpdated()) {
connect(d->m_document->syntaxHighlighterRunner(),
&SyntaxHighlighterRunner::highlightingFinished,
this,
[f = std::move(f)] { f(); }, Qt::SingleShotConnection);
return true;
}
return false;
}
void TextEditorWidget::restoreState(const QByteArray &state)
{
if (state.isEmpty()) {
if (singleShotAfterHighlightingDone([this, state] { restoreState(state); }))
return;
const auto callFoldLicenseHeader = [this] {
if (d->m_displaySettings.m_autoFoldFirstComment)
d->foldLicenseHeader();
};
if (state.isEmpty()) {
callFoldLicenseHeader();
return;
}
int version;
int vval;
int hval;
@@ -3530,8 +3552,7 @@ void TextEditorWidget::restoreState(const QByteArray &state)
documentLayout->emitDocumentSizeChanged();
}
} else {
if (d->m_displaySettings.m_autoFoldFirstComment)
d->foldLicenseHeader();
callFoldLicenseHeader();
}
d->m_lastCursorChangeWasInteresting = false; // avoid adding last position to history
@@ -6642,6 +6663,9 @@ void TextEditorWidget::ensureCursorVisible()
void TextEditorWidget::ensureBlockIsUnfolded(QTextBlock block)
{
if (singleShotAfterHighlightingDone([this, block] { ensureBlockIsUnfolded(block); }))
return;
if (!block.isVisible()) {
auto documentLayout = qobject_cast<TextDocumentLayout*>(document()->documentLayout());
QTC_ASSERT(documentLayout, return);
@@ -8215,6 +8239,9 @@ void TextEditorWidget::foldCurrentBlock()
void TextEditorWidget::fold(const QTextBlock &block)
{
if (singleShotAfterHighlightingDone([this, block] { fold(block); }))
return;
QTextDocument *doc = document();
auto documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout());
QTC_ASSERT(documentLayout, return);
@@ -8235,6 +8262,9 @@ void TextEditorWidget::fold(const QTextBlock &block)
void TextEditorWidget::unfold(const QTextBlock &block)
{
if (singleShotAfterHighlightingDone([this, block] { unfold(block); }))
return;
QTextDocument *doc = document();
auto documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout());
QTC_ASSERT(documentLayout, return);
@@ -8254,6 +8284,9 @@ void TextEditorWidget::unfoldCurrentBlock()
void TextEditorWidget::unfoldAll()
{
if (singleShotAfterHighlightingDone([this] { unfoldAll(); }))
return;
QTextDocument *doc = document();
auto documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout());
QTC_ASSERT(documentLayout, return);