From 280a99b6dcec7c8cb58f5e6e313248e4087b3abc Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 28 Jan 2010 14:17:19 +0100
Subject: [PATCH] Invoke onBlockEnd() after the block highlighter is done.

---
 src/libs/qmljs/qmljshighlighter.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/qmljs/qmljshighlighter.cpp b/src/libs/qmljs/qmljshighlighter.cpp
index 6e5a2e99f35..9c225e3e3a2 100644
--- a/src/libs/qmljs/qmljshighlighter.cpp
+++ b/src/libs/qmljs/qmljshighlighter.cpp
@@ -161,9 +161,8 @@ void QScriptHighlighter::highlightBlock(const QString &text)
     else if (text.length() > lastEnd)
         setFormat(lastEnd, text.length() - lastEnd, m_formats[VisualWhitespace]);
 
-    onBlockEnd(m_scanner.endState(), firstNonSpace);
-
     setCurrentBlockState(m_scanner.endState());
+    onBlockEnd(m_scanner.endState(), firstNonSpace);
 }
 
 void QScriptHighlighter::setFormats(const QVector<QTextCharFormat> &s)
-- 
GitLab