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

TextEditor: Fix continue highlighting

Browse Source 
The highlightStartBlock was incorrectly set to the block that was just
highlighted. This resulted in highlighting the same block over and over
again if it took longer than 20 ms to highlight. Fix this by setting the
highlightStartBlock after moving to the next block.

Additionally make sure that highlightStartBlock is set to INT_MAX after
the highlighting is done to ensure that the check of highlightStartBlock
in SyntaxHighlighterPrivate::reformatBlocks always uses the correct
start block.

Change-Id: I69ea0c7463913d55076601b6a545c127e5382685
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2024-09-05 13:46:49 +02:00
parent 0685a30dde
commit eef8324f71
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/texteditor/syntaxhighlighter.cpp
View File

@@ -228,6 +228,7 @@ void SyntaxHighlighterPrivate::reformatBlocks()
QTC_ASSERT(endBlock.isValid(), endBlock = doc->lastBlock());
while (block.isValid()) {
highlightStartBlock = block.blockNumber();
if (et.elapsed() > 20)
break;
@@ -239,7 +240,6 @@ void SyntaxHighlighterPrivate::reformatBlocks()
forceRehighlightBlocks.remove(block.blockNumber());
forceHighlightOfNextBlock = (block.userState() != stateBeforeHighlight);
}
highlightStartBlock = block.blockNumber();
if (block == endBlock && !forceHighlightOfNextBlock)
break;
@@ -255,6 +255,7 @@ void SyntaxHighlighterPrivate::reformatBlocks()
forceRehighlightBlocks << block.blockNumber();
} else {
highlightEndBlock = 0;
highlightStartBlock = INT_MAX;
syntaxInfoUpToDate = true;
emit q->finished();
}