SyntaxHighlighter: Add rerun if highlighting was interrupted

Added mechanism of highlighting restart when the previous
highlighting was interrupted.

Change-Id: Ic44c06442fd9f0002fed760472d5d39903e7ef50
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 34f4b1c777..f7db190852 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -206,8 +206,11 @@ void SyntaxHighlighterPrivate::reformatBlocks(int from, int charsRemoved, int ch
     vecRes << resStart;
 
     while (block.isValid() && (block.position() < endPosition || forceHighlightOfNextBlock)) {
-        if (QThread::currentThread()->isInterruptionRequested())
-            break;
+        if (QThread::currentThread()->isInterruptionRequested() || q->isInterrupted()) {
+            inReformatBlocks = false;
+            emit q->resultsReady({});
+            return;
+        }
 
         const int stateBeforeHighlight = block.userState();
 
@@ -767,9 +770,7 @@ void SyntaxHighlighter::setExtraFormats(const QTextBlock &block,
     res.m_formatRanges = block.layout()->formats();
     res.fillByBlock(block);
     res.m_state = SyntaxHighlighter::State::Extras;
-    SyntaxHighlighter::Result resDone;
-    resDone.m_state = SyntaxHighlighter::State::Done;
-    emit resultsReady({res, resDone});
+    emit resultsReady({std::move(res)});
 
     document()->markContentsDirty(block.position(), blockLength - 1);
     d->inReformatBlocks = wasInReformatBlocks;
@@ -796,9 +797,7 @@ void SyntaxHighlighter::clearExtraFormats(const QTextBlock &block)
     res.m_formatRanges = block.layout()->formats();
     res.fillByBlock(block);
     res.m_state = SyntaxHighlighter::State::Extras;
-    SyntaxHighlighter::Result resDone;
-    resDone.m_state = SyntaxHighlighter::State::Done;
-    emit resultsReady({res, resDone});
+    emit resultsReady({std::move(res)});
 
     document()->markContentsDirty(block.position(), blockLength - 1);
     d->inReformatBlocks = wasInReformatBlocks;