1 files changed, 33 insertions, 9 deletions
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index db1a38e68c..56c7ca1dde 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -65,6 +65,18 @@ public:
 
     void _q_reformatBlocks(int from, int charsRemoved, int charsAdded);
     void reformatBlock(QTextBlock block);
+    
+    inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation) {
+        QObject::disconnect(doc, SIGNAL(contentsChange(int,int,int)),
+                            q_func(), SLOT(_q_reformatBlocks(int,int,int)));
+        cursor.beginEditBlock();
+        int from = cursor.position();
+        cursor.movePosition(operation);
+        _q_reformatBlocks(from, 0, cursor.position() - from);
+        cursor.endEditBlock();
+        QObject::connect(doc, SIGNAL(contentsChange(int,int,int)),
+                         q_func(), SLOT(_q_reformatBlocks(int,int,int)));
+    }
 
     inline void _q_delayedRehighlight() {
         if (!rehighlightPending)
@@ -355,7 +367,9 @@ QTextDocument *QSyntaxHighlighter::document() const
 /*!
     \since 4.2
 
-    Redoes the highlighting of the whole document.
+    Reapplies the highlighting to the whole document.
+
+    \sa rehighlightBlock()
 */
 void QSyntaxHighlighter::rehighlight()
 {
@@ -363,15 +377,25 @@ void QSyntaxHighlighter::rehighlight()
     if (!d->doc)
         return;
 
-    disconnect(d->doc, SIGNAL(contentsChange(int,int,int)),
-               this, SLOT(_q_reformatBlocks(int,int,int)));
     QTextCursor cursor(d->doc);
-    cursor.beginEditBlock();
-    cursor.movePosition(QTextCursor::End);
-    d->_q_reformatBlocks(0, 0, cursor.position());
-    cursor.endEditBlock();
-    connect(d->doc, SIGNAL(contentsChange(int,int,int)),
-            this, SLOT(_q_reformatBlocks(int,int,int)));
+    d->rehighlight(cursor, QTextCursor::End);
+}
+
+/*!
+    \since 4.6
+
+    Reapplies the highlighting to the given QTextBlock \a block.
+    
+    \sa rehighlight()
+*/
+void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
+{
+    Q_D(QSyntaxHighlighter);
+    if (!d->doc)
+        return;
+
+    QTextCursor cursor(block);
+    d->rehighlight(cursor, QTextCursor::EndOfBlock);
 }
 
 /*!