Add common interface for text formats inside syntax highlighter

Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 34 insertions, 0 deletions

diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index de9c5acd092..0ad601f162e 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -30,6 +30,10 @@
 #include "syntaxhighlighter.h"
 #include "basetextdocument.h"
 #include "basetextdocumentlayout.h"
+#include "texteditorsettings.h"
+#include "fontsettings.h"
+
+#include <utils/qtcassert.h>
 
 #include <qtimer.h>
 
@@ -70,12 +74,15 @@ public:
     }
 
     void applyFormatChanges(int from, int charsRemoved, int charsAdded);
+    void updateFormatsForCategories(const TextEditor::FontSettings &fontSettings);
 
     QVector<QTextCharFormat> formatChanges;
     QTextBlock currentBlock;
     bool rehighlightPending;
     bool inReformatBlocks;
     BaseTextDocumentLayout::FoldValidator foldValidator;
+    QVector<QTextCharFormat> formats;
+    QVector<TextEditor::TextStyle> formatCategories;
 };
 
 static bool adjustRange(QTextLayout::FormatRange &range, int from, int charsRemoved, int charsAdded) {
@@ -784,4 +791,31 @@ QList<QColor> SyntaxHighlighter::generateColors(int n, const QColor &background)
     return result;
 }
 
+void SyntaxHighlighter::setFontSettings(const TextEditor::FontSettings &fontSettings)
+{
+    Q_D(SyntaxHighlighter);
+    d->updateFormatsForCategories(fontSettings);
+}
+
+void SyntaxHighlighter::setTextFormatCategories(const QVector<TextEditor::TextStyle> &categories)
+{
+    Q_D(SyntaxHighlighter);
+    d->formatCategories = categories;
+    d->updateFormatsForCategories(TextEditorSettings::instance()->fontSettings());
+}
+
+QTextCharFormat SyntaxHighlighter::formatForCategory(int category) const
+{
+    Q_D(const SyntaxHighlighter);
+    QTC_ASSERT(d->formats.size() > category, return QTextCharFormat());
+
+    return d->formats.at(category);
+}
+
+void SyntaxHighlighterPrivate::updateFormatsForCategories(const TextEditor::FontSettings &fontSettings)
+{
+    formats = fontSettings.toTextCharFormats(formatCategories);
+}
+
+
 #include "moc_syntaxhighlighter.cpp"