SyntaxHighlighter: Make setChangeNumbers private function

Made setChangeNumbers private function in BaseAnnotationHighlighter
and remove usage in other places.
Moved annotationChanges to BaseAnnotationHighlighterPrivate from
VcsBaseEditorWidget.
This was done to move all instances of TextEditor::SyntaxHighlighter.
In this regards only the public API of TextEditor::SyntaxHighlighter
should be available from children and no other additional functions.

Change-Id: Ibece9476a810e13c8722839820d5c575b0808f03
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 24a96522b3..36c4549487 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -308,6 +308,9 @@ SyntaxHighlighter::~SyntaxHighlighter()
 void SyntaxHighlighter::setDocument(QTextDocument *doc)
 {
     Q_D(SyntaxHighlighter);
+    if (d->doc == doc)
+        return;
+
     if (d->doc) {
         disconnect(d->doc, &QTextDocument::contentsChange, this, &SyntaxHighlighter::reformatBlocks);
 
@@ -317,7 +320,9 @@ void SyntaxHighlighter::setDocument(QTextDocument *doc)
             blk.layout()->clearFormats();
         cursor.endEditBlock();
     }
+    QTextDocument *oldDoc = d->doc;
     d->doc = doc;
+    documentChanged(oldDoc, d->doc);
     if (d->doc) {
         if (!d->noAutomaticHighlighting) {
             connect(d->doc, &QTextDocument::contentsChange, this, &SyntaxHighlighter::reformatBlocks);