diff options
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp')
| -rw-r--r-- | src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp | 209 |
1 files changed, 117 insertions, 92 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp index eac9a92264..9d42d03db0 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/themedata.cpp @@ -1,29 +1,13 @@ /* - Copyright (C) 2016 Volker Krause <vkrause@kde.org> - Copyright (C) 2016 Dominik Haumann <dhaumann@kde.org> - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + SPDX-FileCopyrightText: 2016 Volker Krause <vkrause@kde.org> + SPDX-FileCopyrightText: 2016 Dominik Haumann <dhaumann@kde.org> + SPDX-FileCopyrightText: 2020 Jonathan Poelen <jonathan.poelen@gmail.com> + + SPDX-License-Identifier: MIT */ -#include "themedata_p.h" #include "ksyntaxhighlighting_logging.h" +#include "themedata_p.h" #include <QFile> #include <QFileInfo> @@ -32,23 +16,17 @@ #include <QJsonValue> #include <QMetaEnum> -#include <QDebug> - using namespace KSyntaxHighlighting; -ThemeData* ThemeData::get(const Theme &theme) -{ - return theme.m_data.data(); -} - ThemeData::ThemeData() { memset(m_editorColors, 0, sizeof(m_editorColors)); + m_textStyles.resize(QMetaEnum::fromType<Theme::TextStyle>().keyCount()); } /** * Convert QJsonValue @p val into a color, if possible. Valid colors are only - * in hex format: #rrggbb. On error, returns 0x00000000. + * in hex format: #aarrggbb. On error, returns 0x00000000. */ static inline QRgb readColor(const QJsonValue &val) { @@ -61,7 +39,7 @@ static inline QRgb readColor(const QJsonValue &val) return unsetColor; } const QColor color(str); - return color.isValid() ? color.rgb() : unsetColor; + return color.isValid() ? color.rgba() : unsetColor; } static inline TextStyleData readThemeData(const QJsonObject &obj) @@ -104,9 +82,18 @@ bool ThemeData::load(const QString &filePath) return false; } const QByteArray jsonData = loadFile.readAll(); + // look for metadata object + int metaDataStart = jsonData.indexOf("\"metadata\""); + int start = jsonData.indexOf('{', metaDataStart); + int end = jsonData.indexOf("}", metaDataStart); + if (start < 0 || end < 0) { + qCWarning(Log) << "Failed to parse theme file" << filePath << ":" + << "no metadata object found"; + return false; + } QJsonParseError parseError; - QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parseError); + QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData.mid(start, (end + 1) - start), &parseError); if (parseError.error != QJsonParseError::NoError) { qCWarning(Log) << "Failed to parse theme file" << filePath << ":" << parseError.errorString(); return false; @@ -114,65 +101,93 @@ bool ThemeData::load(const QString &filePath) m_filePath = filePath; - QJsonObject obj = jsonDoc.object(); - // read metadata - const QJsonObject metadata = obj.value(QLatin1String("metadata")).toObject(); + QJsonObject metadata = jsonDoc.object(); m_name = metadata.value(QLatin1String("name")).toString(); m_revision = metadata.value(QLatin1String("revision")).toInt(); + return true; +} + +void ThemeData::loadComplete() +{ + if (m_completelyLoaded) { + return; + } + m_completelyLoaded = true; + + QFile loadFile(m_filePath); + if (!loadFile.open(QIODevice::ReadOnly)) { + return; + } + const QByteArray jsonData = loadFile.readAll(); + + QJsonParseError parseError; + QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonData, &parseError); + if (parseError.error != QJsonParseError::NoError) { + qCWarning(Log) << "Failed to parse theme file" << m_filePath << ":" << parseError.errorString(); + return; + } + QJsonObject obj = jsonDoc.object(); // read text styles - static const auto idx = Theme::staticMetaObject.indexOfEnumerator("TextStyle"); - Q_ASSERT(idx >= 0); - const auto metaEnum = Theme::staticMetaObject.enumerator(idx); + const auto metaEnumStyle = QMetaEnum::fromType<Theme::TextStyle>(); const QJsonObject textStyles = obj.value(QLatin1String("text-styles")).toObject(); - for (int i = 0; i < metaEnum.keyCount(); ++i) { - Q_ASSERT(i == metaEnum.value(i)); - m_textStyles[i] = readThemeData(textStyles.value(QLatin1String(metaEnum.key(i))).toObject()); + for (int i = 0; i < metaEnumStyle.keyCount(); ++i) { + Q_ASSERT(i == metaEnumStyle.value(i)); + m_textStyles[i] = readThemeData(textStyles.value(QLatin1String(metaEnumStyle.key(i))).toObject()); } - // read editor area colors + // read editor colors + const auto metaEnumColor = QMetaEnum::fromType<Theme::EditorColorRole>(); const QJsonObject editorColors = obj.value(QLatin1String("editor-colors")).toObject(); - m_editorColors[Theme::BackgroundColor] = readColor(editorColors.value(QLatin1String("background-color"))); - m_editorColors[Theme::TextSelection] = readColor(editorColors.value(QLatin1String("selection"))); - m_editorColors[Theme::CurrentLine] = readColor(editorColors.value(QLatin1String("current-line"))); - m_editorColors[Theme::SearchHighlight] = readColor(editorColors.value(QLatin1String("search-highlight"))); - m_editorColors[Theme::ReplaceHighlight] = readColor(editorColors.value(QLatin1String("replace-highlight"))); - m_editorColors[Theme::BracketMatching] = readColor(editorColors.value(QLatin1String("bracket-matching"))); - m_editorColors[Theme::TabMarker] = readColor(editorColors.value(QLatin1String("tab-marker"))); - m_editorColors[Theme::SpellChecking] = readColor(editorColors.value(QLatin1String("spell-checking"))); - m_editorColors[Theme::IndentationLine] = readColor(editorColors.value(QLatin1String("indentation-line"))); - m_editorColors[Theme::IconBorder] = readColor(editorColors.value(QLatin1String("icon-border"))); - m_editorColors[Theme::CodeFolding] = readColor(editorColors.value(QLatin1String("code-folding"))); - m_editorColors[Theme::LineNumbers] = readColor(editorColors.value(QLatin1String("line-numbers"))); - m_editorColors[Theme::CurrentLineNumber] = readColor(editorColors.value(QLatin1String("current-line-number"))); - m_editorColors[Theme::WordWrapMarker] = readColor(editorColors.value(QLatin1String("word-wrap-marker"))); - m_editorColors[Theme::ModifiedLines] = readColor(editorColors.value(QLatin1String("modified-lines"))); - m_editorColors[Theme::SavedLines] = readColor(editorColors.value(QLatin1String("saved-lines"))); - m_editorColors[Theme::Separator] = readColor(editorColors.value(QLatin1String("separator"))); - m_editorColors[Theme::MarkBookmark] = readColor(editorColors.value(QLatin1String("mark-bookmark"))); - m_editorColors[Theme::MarkBreakpointActive] = readColor(editorColors.value(QLatin1String("mark-breakpoint-active"))); - m_editorColors[Theme::MarkBreakpointReached] = readColor(editorColors.value(QLatin1String("mark-breakpoint-reached"))); - m_editorColors[Theme::MarkBreakpointDisabled] = readColor(editorColors.value(QLatin1String("mark-breakpoint-disabled"))); - m_editorColors[Theme::MarkExecution] = readColor(editorColors.value(QLatin1String("mark-execution"))); - m_editorColors[Theme::MarkWarning] = readColor(editorColors.value(QLatin1String("mark-warning"))); - m_editorColors[Theme::MarkError] = readColor(editorColors.value(QLatin1String("mark-error"))); - m_editorColors[Theme::TemplateBackground] = readColor(editorColors.value(QLatin1String("template-background"))); - m_editorColors[Theme::TemplatePlaceholder] = readColor(editorColors.value(QLatin1String("template-placeholder"))); - m_editorColors[Theme::TemplateFocusedPlaceholder] = readColor(editorColors.value(QLatin1String("template-focused-placeholder"))); - m_editorColors[Theme::TemplateReadOnlyPlaceholder] = readColor(editorColors.value(QLatin1String("template-read-only-placeholder"))); + for (int i = 0; i < metaEnumColor.keyCount(); ++i) { + Q_ASSERT(i == metaEnumColor.value(i)); + m_editorColors[i] = readColor(editorColors.value(QLatin1String(metaEnumColor.key(i)))); + } + + // if we have no new key around for Theme::BackgroundColor => use old variants to be compatible + if (!editorColors.contains(QLatin1String(metaEnumColor.key(Theme::BackgroundColor)))) { + m_editorColors[Theme::BackgroundColor] = readColor(editorColors.value(QLatin1String("background-color"))); + m_editorColors[Theme::TextSelection] = readColor(editorColors.value(QLatin1String("selection"))); + m_editorColors[Theme::CurrentLine] = readColor(editorColors.value(QLatin1String("current-line"))); + m_editorColors[Theme::SearchHighlight] = readColor(editorColors.value(QLatin1String("search-highlight"))); + m_editorColors[Theme::ReplaceHighlight] = readColor(editorColors.value(QLatin1String("replace-highlight"))); + m_editorColors[Theme::BracketMatching] = readColor(editorColors.value(QLatin1String("bracket-matching"))); + m_editorColors[Theme::TabMarker] = readColor(editorColors.value(QLatin1String("tab-marker"))); + m_editorColors[Theme::SpellChecking] = readColor(editorColors.value(QLatin1String("spell-checking"))); + m_editorColors[Theme::IndentationLine] = readColor(editorColors.value(QLatin1String("indentation-line"))); + m_editorColors[Theme::IconBorder] = readColor(editorColors.value(QLatin1String("icon-border"))); + m_editorColors[Theme::CodeFolding] = readColor(editorColors.value(QLatin1String("code-folding"))); + m_editorColors[Theme::LineNumbers] = readColor(editorColors.value(QLatin1String("line-numbers"))); + m_editorColors[Theme::CurrentLineNumber] = readColor(editorColors.value(QLatin1String("current-line-number"))); + m_editorColors[Theme::WordWrapMarker] = readColor(editorColors.value(QLatin1String("word-wrap-marker"))); + m_editorColors[Theme::ModifiedLines] = readColor(editorColors.value(QLatin1String("modified-lines"))); + m_editorColors[Theme::SavedLines] = readColor(editorColors.value(QLatin1String("saved-lines"))); + m_editorColors[Theme::Separator] = readColor(editorColors.value(QLatin1String("separator"))); + m_editorColors[Theme::MarkBookmark] = readColor(editorColors.value(QLatin1String("mark-bookmark"))); + m_editorColors[Theme::MarkBreakpointActive] = readColor(editorColors.value(QLatin1String("mark-breakpoint-active"))); + m_editorColors[Theme::MarkBreakpointReached] = readColor(editorColors.value(QLatin1String("mark-breakpoint-reached"))); + m_editorColors[Theme::MarkBreakpointDisabled] = readColor(editorColors.value(QLatin1String("mark-breakpoint-disabled"))); + m_editorColors[Theme::MarkExecution] = readColor(editorColors.value(QLatin1String("mark-execution"))); + m_editorColors[Theme::MarkWarning] = readColor(editorColors.value(QLatin1String("mark-warning"))); + m_editorColors[Theme::MarkError] = readColor(editorColors.value(QLatin1String("mark-error"))); + m_editorColors[Theme::TemplateBackground] = readColor(editorColors.value(QLatin1String("template-background"))); + m_editorColors[Theme::TemplatePlaceholder] = readColor(editorColors.value(QLatin1String("template-placeholder"))); + m_editorColors[Theme::TemplateFocusedPlaceholder] = readColor(editorColors.value(QLatin1String("template-focused-placeholder"))); + m_editorColors[Theme::TemplateReadOnlyPlaceholder] = readColor(editorColors.value(QLatin1String("template-read-only-placeholder"))); + } // read per-definition style overrides const auto customStyles = obj.value(QLatin1String("custom-styles")).toObject(); for (auto it = customStyles.begin(); it != customStyles.end(); ++it) { const auto obj = it.value().toObject(); - QHash<QString, TextStyleData> overrideStyle; - for (auto it2 = obj.begin(); it2 != obj.end(); ++it2) + auto &overrideStyle = m_textStyleOverrides[it.key()]; + for (auto it2 = obj.begin(); it2 != obj.end(); ++it2) { overrideStyle.insert(it2.key(), readThemeData(it2.value().toObject())); - m_textStyleOverrides.insert(it.key(), overrideStyle); + } } - return true; + return; } QString ThemeData::name() const @@ -195,61 +210,71 @@ QString ThemeData::filePath() const return m_filePath; } +TextStyleData ThemeData::textStyle(Theme::TextStyle style) const +{ + if (!m_completelyLoaded) { + const_cast<ThemeData *>(this)->loadComplete(); + } + return m_textStyles[style]; +} + QRgb ThemeData::textColor(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].textColor; + return textStyle(style).textColor; } QRgb ThemeData::selectedTextColor(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].selectedTextColor; + return textStyle(style).selectedTextColor; } QRgb ThemeData::backgroundColor(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].backgroundColor; + return textStyle(style).backgroundColor; } QRgb ThemeData::selectedBackgroundColor(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].selectedBackgroundColor; + return textStyle(style).selectedBackgroundColor; } bool ThemeData::isBold(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].bold; + return textStyle(style).bold; } bool ThemeData::isItalic(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].italic; + return textStyle(style).italic; } bool ThemeData::isUnderline(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].underline; + return textStyle(style).underline; } bool ThemeData::isStrikeThrough(Theme::TextStyle style) const { - Q_ASSERT(static_cast<int>(style) >= 0 && static_cast<int>(style) <= static_cast<int>(Theme::Others)); - return m_textStyles[style].strikeThrough; + return textStyle(style).strikeThrough; } QRgb ThemeData::editorColor(Theme::EditorColorRole role) const { + if (!m_completelyLoaded) { + const_cast<ThemeData *>(this)->loadComplete(); + } Q_ASSERT(static_cast<int>(role) >= 0 && static_cast<int>(role) <= static_cast<int>(Theme::TemplateReadOnlyPlaceholder)); return m_editorColors[role]; } -TextStyleData ThemeData::textStyleOverride(const QString& definitionName, const QString& attributeName) const +TextStyleData ThemeData::textStyleOverride(const QString &definitionName, const QString &attributeName) const { - return m_textStyleOverrides.value(definitionName).value(attributeName); + if (!m_completelyLoaded) { + const_cast<ThemeData *>(this)->loadComplete(); + } + auto it = m_textStyleOverrides.find(definitionName); + if (it != m_textStyleOverrides.end()) { + return it->value(attributeName); + } + return TextStyleData(); } |