SyntiaxHighlighter: Move VCS highlighters creating to TextDocument

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

src/plugins/bazaar/bazaareditor.cpp

@@ -59,9 +59,9 @@ QString BazaarEditorWidget::changeUnderCursor(const QTextCursor &cursorIn) const
     return {};
 }
 
-VcsBase::BaseAnnotationHighlighter *BazaarEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator BazaarEditorWidget::annotationHighlighterCreator() const
 {
-    return new BazaarAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new BazaarAnnotationHighlighter(changes); };
 }
 
 } // Bazaar::Internal

src/plugins/bazaar/bazaareditor.h

@@ -16,8 +16,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &cursor) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
 
     const QRegularExpression m_changesetId;
     const QRegularExpression m_exactChangesetId;

src/plugins/clearcase/clearcaseeditor.cpp

@@ -42,9 +42,9 @@ QString ClearCaseEditorWidget::changeUnderCursor(const QTextCursor &c) const
     return QString();
 }
 
-VcsBase::BaseAnnotationHighlighter *ClearCaseEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator ClearCaseEditorWidget::annotationHighlighterCreator() const
 {
-    return new ClearCaseAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new ClearCaseAnnotationHighlighter(changes); };
 }
 
 } // ClearCase::Internal

src/plugins/clearcase/clearcaseeditor.h

@@ -18,8 +18,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
 
     const QRegularExpression m_versionNumberPattern;
 };

src/plugins/cvs/cvseditor.cpp

@@ -93,9 +93,9 @@ QString CvsEditorWidget::changeUnderCursor(const QTextCursor &c) const
     return {};
 }
 
-VcsBase::BaseAnnotationHighlighter *CvsEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator CvsEditorWidget::annotationHighlighterCreator() const
 {
-    return new CvsAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new CvsAnnotationHighlighter(changes); };
 }
 
 QStringList CvsEditorWidget::annotationPreviousVersions(const QString &revision) const

src/plugins/cvs/cvseditor.h

@@ -18,8 +18,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
     QStringList annotationPreviousVersions(const QString &revision) const override;
 
     const QRegularExpression m_revisionAnnotationPattern;

src/plugins/fossil/fossileditor.cpp

@@ -89,10 +89,9 @@ QStringList FossilEditorWidget::annotationPreviousVersions(const QString &revisi
     return revisions;
 }
 
-VcsBase::BaseAnnotationHighlighter *FossilEditorWidget::createAnnotationHighlighter(
+VcsBase::BaseAnnotationHighlighterCreator FossilEditorWidget::annotationHighlighterCreator() const
-        const QSet<QString> &changes) const
 {
-    return new FossilAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new FossilAnnotationHighlighter(changes); };
 }
 
 } // namespace Fossil::Internal

src/plugins/fossil/fossileditor.h

@@ -22,8 +22,7 @@ private:
     QString changeUnderCursor(const QTextCursor &cursor) const final;
     QString decorateVersion(const QString &revision) const final;
     QStringList annotationPreviousVersions(const QString &revision) const final;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const final;
-            const QSet<QString> &changes) const final;
 
     FossilEditorWidgetPrivate *d;
 };

src/plugins/git/giteditor.cpp

@@ -117,9 +117,9 @@ QString GitEditorWidget::changeUnderCursor(const QTextCursor &c) const
     return {};
 }
 
-BaseAnnotationHighlighter *GitEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator GitEditorWidget::annotationHighlighterCreator() const
 {
-    return new GitAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new GitAnnotationHighlighter(changes); };
 }
 
 /* Remove the date specification from annotation, which is tabular:

src/plugins/git/giteditor.h

@@ -42,7 +42,7 @@ private:
     void addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk) override;
     void aboutToOpen(const Utils::FilePath &filePath, const Utils::FilePath &realFilePath) override;
     QString changeUnderCursor(const QTextCursor &) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const override;
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
     QString decorateVersion(const QString &revision) const override;
     QStringList annotationPreviousVersions(const QString &revision) const override;
     bool isValidRevision(const QString &revision) const override;

src/plugins/mercurial/mercurialeditor.cpp

@@ -48,9 +48,9 @@ QString MercurialEditorWidget::changeUnderCursor(const QTextCursor &cursorIn) co
     return {};
 }
 
-VcsBase::BaseAnnotationHighlighter *MercurialEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator MercurialEditorWidget::annotationHighlighterCreator() const
 {
-    return new MercurialAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new MercurialAnnotationHighlighter(changes); };
 }
 
 QString MercurialEditorWidget::decorateVersion(const QString &revision) const

src/plugins/mercurial/mercurialeditor.h

@@ -18,8 +18,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &cursor) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
     QString decorateVersion(const QString &revision) const override;
     QStringList annotationPreviousVersions(const QString &revision) const override;
 

src/plugins/perforce/perforceeditor.cpp

@@ -51,9 +51,9 @@ QString PerforceEditorWidget::changeUnderCursor(const QTextCursor &c) const
     return m_changeNumberPattern.match(change).hasMatch() ? change : QString();
 }
 
-VcsBase::BaseAnnotationHighlighter *PerforceEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator PerforceEditorWidget::annotationHighlighterCreator() const
 {
-    return new PerforceAnnotationHighlighter(changes);
+    return [](const QSet<QString> &changes) { return new PerforceAnnotationHighlighter(changes); };
 }
 
 QString PerforceEditorWidget::findDiffFile(const QString &f) const

src/plugins/perforce/perforceeditor.h

@@ -18,8 +18,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
     QString findDiffFile(const QString &f) const override;
     QStringList annotationPreviousVersions(const QString &v) const override;
 

src/plugins/subversion/subversioneditor.cpp

@@ -75,9 +75,10 @@ QString SubversionEditorWidget::changeUnderCursor(const QTextCursor &c) const
     return {};
 }
 
-VcsBase::BaseAnnotationHighlighter *SubversionEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighterCreator SubversionEditorWidget::annotationHighlighterCreator() const
 {
-    return new SubversionAnnotationHighlighter(changes);
+    return
+        [](const QSet<QString> &changes) { return new SubversionAnnotationHighlighter(changes); };
 }
 
 QStringList SubversionEditorWidget::annotationPreviousVersions(const QString &v) const

src/plugins/subversion/subversioneditor.h

@@ -19,8 +19,7 @@ public:
 
 private:
     QString changeUnderCursor(const QTextCursor &) const override;
-    VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(
+    VcsBase::BaseAnnotationHighlighterCreator annotationHighlighterCreator() const override;
-            const QSet<QString> &changes) const override;
     QStringList annotationPreviousVersions(const QString &) const override;
 
     QRegularExpression m_changeNumberPattern;

src/plugins/vcsbase/vcsbaseeditor.cpp

@@ -1104,8 +1104,8 @@ void VcsBaseEditorWidget::slotActivateAnnotation()
         ah->setChangeNumbers(changes);
         ah->rehighlight();
     } else {
-        BaseAnnotationHighlighter *highlighter = createAnnotationHighlighter(changes);
+        BaseAnnotationHighlighterCreator creator = annotationHighlighterCreator();
-        textDocument()->setSyntaxHighlighterCreator([highlighter] { return highlighter; });
+        textDocument()->setSyntaxHighlighterCreator([creator, changes] { return creator(changes); });
     }
 }
 

src/plugins/vcsbase/vcsbaseeditor.h

@@ -109,6 +109,9 @@ public:
     void finalizeInitialization() override;
 };
 
+using BaseAnnotationHighlighterCreator
+    = std::function<BaseAnnotationHighlighter *(const QSet<QString> &)>;
+
 class VCSBASE_EXPORT VcsBaseEditorWidget : public TextEditor::TextEditorWidget
 {
     Q_OBJECT
@@ -223,7 +226,7 @@ protected:
     // Implement to identify a change number at the cursor position
     virtual QString changeUnderCursor(const QTextCursor &) const = 0;
     // Factory functions for highlighters
-    virtual BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const = 0;
+    virtual BaseAnnotationHighlighterCreator annotationHighlighterCreator() const = 0;
     // Returns a local file name from the diff file specification
     // (text cursor at position above change hunk)
     QString fileNameFromDiffSpecification(const QTextBlock &inBlock, QString *header = nullptr) const;