diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 9e0df1bc6f2..d21c7cb9bc1 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -678,25 +678,4 @@ QString ansiColoredText(const QString &text, const QColor &color) return formatString.arg(color.red()).arg(color.green()).arg(color.blue()).arg(text); } -static HighlightCallback &codeHighlighter() -{ - static HighlightCallback s_highlighter; - return s_highlighter; -} - -QTextDocument *highlightCode(const QString &code, const QString &mimeType) -{ - if (const auto highlighter = codeHighlighter()) - return highlighter(code, mimeType); - - QTextDocument *doc = new QTextDocument; - doc->setPlainText(code); - return doc; -} - -void setCodeHighlighter(const HighlightCallback &highlighter) -{ - codeHighlighter() = highlighter; -} - } // namespace Utils diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h index 599d5102ba6..141ab7f1040 100644 --- a/src/libs/utils/stringutils.h +++ b/src/libs/utils/stringutils.h @@ -141,8 +141,4 @@ private: QTCREATOR_UTILS_EXPORT QString ansiColoredText(const QString &text, const QColor &color); -using HighlightCallback = std::function; -QTCREATOR_UTILS_EXPORT QTextDocument *highlightCode(const QString &code, const QString &mimeType); -QTCREATOR_UTILS_EXPORT void setCodeHighlighter(const HighlightCallback &highlighter); - } // namespace Utils diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index 15d17554b08..c3b2822ae3e 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -293,4 +293,25 @@ QDebug &operator<<(QDebug &stream, const Position &pos) return stream; } +static HighlightCallback &codeHighlighter() +{ + static HighlightCallback s_highlighter; + return s_highlighter; +} + +QTextDocument *highlightCode(const QString &code, const QString &mimeType) +{ + if (const auto highlighter = codeHighlighter()) + return highlighter(code, mimeType); + + QTextDocument *doc = new QTextDocument; + doc->setPlainText(code); + return doc; +} + +void setCodeHighlighter(const HighlightCallback &highlighter) +{ + codeHighlighter() = highlighter; +} + } // namespace Utils::Text diff --git a/src/libs/utils/textutils.h b/src/libs/utils/textutils.h index c2e3fecbc28..a900cb6e9d4 100644 --- a/src/libs/utils/textutils.h +++ b/src/libs/utils/textutils.h @@ -84,6 +84,10 @@ QTCREATOR_UTILS_EXPORT QString utf16LineTextInUtf8Buffer(const QByteArray &utf8B QTCREATOR_UTILS_EXPORT QDebug &operator<<(QDebug &stream, const Position &pos); +using HighlightCallback = std::function; +QTCREATOR_UTILS_EXPORT QTextDocument *highlightCode(const QString &code, const QString &mimeType); +QTCREATOR_UTILS_EXPORT void setCodeHighlighter(const HighlightCallback &highlighter); + } // Text } // Utils