Differential D19876 Diff 54775 src/syntax/katehighlight.cpp

Changeset View

Standalone View

View Options

src/syntax/katehighlight.cpp

Show First 20 Lines • Show All 62 Lines • ▼ Show 20 Line(s)58{
63 if (textStyle == KSyntaxHighlighting::Theme::Others) { 63​ if (textStyle == KSyntaxHighlighting::Theme::Others) {
64 return KTextEditor::dsOthers; 64​ return KTextEditor::dsOthers;
65 } 65​ }
66 66​
67 // else: simple cast 67​ // else: simple cast
68 return static_cast<KTextEditor::DefaultStyle>(textStyle); 68​ return static_cast<KTextEditor::DefaultStyle>(textStyle);
69} 69​}
70 70​
71​/**
72​ * convert the theme/schema name from KTextEditor => KSyntaxHighlighting.
73​ * NOTE: some themes of KTextEditor don't exist in KSyntaxHighlighting
74​ */
75​inline QString convertThemeName(const QString &schema)
76​{
77​ if (schema == QLatin1String("Normal")) {
78​ return QStringLiteral("Default");
mwolffUnsubmitted
Done

return QStringLiteral, otherwise you allocate on every function call (also below)

mwolff: return QStringLiteral, otherwise you allocate on every function call (also below)
79​ } else if (schema == QLatin1String("Solarized (light)")) {
80​ return QStringLiteral("Solarized Light");
81​ } else if (schema == QLatin1String("Solarized (dark)")) {
82​ return QStringLiteral("Solarized Dark");
83​ }
84​ return schema;
85​}
86​
71} 87​}
72//END 88​//END
73 89​
74//BEGIN KateHighlighting 90​//BEGIN KateHighlighting
75KateHighlighting::KateHighlighting(const KSyntaxHighlighting::Definition &def) 91​KateHighlighting::KateHighlighting(const KSyntaxHighlighting::Definition &def)
76{ 92​{
77 /** 93​ /**
78 * get name and section, always works 94​ * get name and section, always works
▲ Show 20 Lines • Show All 215 Lines • ▼ Show 20 Line(s)284{
294 } 310​ }
295} 311​}
296 312​
297void KateHighlighting::getKateExtendedAttributeList(const QString &schema, QVector<KTextEditor::Attribute::Ptr> &list, KConfig *cfg) 313​void KateHighlighting::getKateExtendedAttributeList(const QString &schema, QVector<KTextEditor::Attribute::Ptr> &list, KConfig *cfg)
298{ 314​{
299 KConfigGroup config(cfg ? cfg : KateHlManager::self()->getKConfig(), 315​ KConfigGroup config(cfg ? cfg : KateHlManager::self()->getKConfig(),
300 QLatin1String("Highlighting ") + iName + QLatin1String(" - Schema ") + schema); 316​ QLatin1String("Highlighting ") + iName + QLatin1String(" - Schema ") + schema);
301 317​
302 list = attributesForDefinition(); 318​ list = attributesForDefinition(schema);
303 319​
304 foreach (KTextEditor::Attribute::Ptr p, list) { 320​ foreach (KTextEditor::Attribute::Ptr p, list) {
305 Q_ASSERT(p); 321​ Q_ASSERT(p);
306 322​
307 QStringList s = config.readEntry(p->name(), QStringList()); 323​ QStringList s = config.readEntry(p->name(), QStringList());
308 324​
309// qCDebug(LOG_KTE)<<p->name<<s.count(); 325​// qCDebug(LOG_KTE)<<p->name<<s.count();
310 if (!s.isEmpty()) { 326​ if (!s.isEmpty()) {
▲ Show 20 Lines • Show All 189 Lines • ▼ Show 20 Line(s)
500} 516​}
501 517​
502void KateHighlighting::clearAttributeArrays() 518​void KateHighlighting::clearAttributeArrays()
503{ 519​{
504 // just clear the hashed attributes, we create them lazy again 520​ // just clear the hashed attributes, we create them lazy again
505 m_attributeArrays.clear(); 521​ m_attributeArrays.clear();
506} 522​}
507 523​
508QVector<KTextEditor::Attribute::Ptr> KateHighlighting::attributesForDefinition() 524​QVector<KTextEditor::Attribute::Ptr> KateHighlighting::attributesForDefinition(const QString &schema)
509{ 525​{
510 /** 526​ /**
527​ * get the KSyntaxHighlighting theme from the chosen schema
528​ */
529​ KSyntaxHighlighting::Theme currentTheme = KateHlManager::self()->repository().theme(convertThemeName(schema));
530​
531​ /**
511 * create list of all known things 532​ * create list of all known things
512 */ 533​ */
513 QVector<KTextEditor::Attribute::Ptr> array; 534​ QVector<KTextEditor::Attribute::Ptr> array;
514 for (const auto &format : m_formats) { 535​ for (const auto &format : m_formats) {
515 /** 536​ /**
516 * FIXME: atm we just set some theme here for later color generation 537​ * atm we just set the current chosen theme here for later color generation.
538​ * NOTE: if the theme isn't valid for KSyntaxHighlighting, the default light theme will be used.
539​ * For example, the "KDE" and "Vim (dark)" themes don't exist in KSyntaxHighlighting.
517 */ 540​ */
541​ if (currentTheme.isValid()) {
542​ setTheme(currentTheme);
543​ } else {
518 setTheme(KateHlManager::self()->repository().defaultTheme(KSyntaxHighlighting::Repository::LightTheme)); 544​ setTheme(KateHlManager::self()->repository().defaultTheme(KSyntaxHighlighting::Repository::LightTheme));
545​ }
519 546​
520 /** 547​ /**
521 * create a KTextEditor attribute matching the given format 548​ * create a KTextEditor attribute matching the given format
522 */ 549​ */
523 KTextEditor::Attribute::Ptr newAttribute(new KTextEditor::Attribute(nameForAttrib(array.size()), textStyleToDefaultStyle(format.textStyle()))); 550​ KTextEditor::Attribute::Ptr newAttribute(new KTextEditor::Attribute(nameForAttrib(array.size()), textStyleToDefaultStyle(format.textStyle())));
524 551​
552​ /**
553​ * don't apply attribute styles for schemas/themes that don't exist in KSyntaxHighlighting,
554​ * but exist in KTextEditor
555​ */
556​ if (currentTheme.isValid()) {
525 if (format.hasTextColor(theme())) { 557​ if (format.hasTextColor(theme())) {
526 newAttribute->setForeground(format.textColor(theme())); 558​ newAttribute->setForeground(format.textColor(theme()));
527 newAttribute->setSelectedForeground(format.selectedTextColor(theme())); 559​ newAttribute->setSelectedForeground(format.selectedTextColor(theme()));
528 } 560​ }
529 561​
530 if (format.hasBackgroundColor(theme())) { 562​ if (format.hasBackgroundColor(theme())) {
531 newAttribute->setBackground(format.backgroundColor(theme())); 563​ newAttribute->setBackground(format.backgroundColor(theme()));
532 newAttribute->setSelectedBackground(format.selectedBackgroundColor(theme())); 564​ newAttribute->setSelectedBackground(format.selectedBackgroundColor(theme()));
Show All 9 Lines
542 574​
543 if (format.isUnderline(theme())) { 575​ if (format.isUnderline(theme())) {
544 newAttribute->setFontUnderline(true); 576​ newAttribute->setFontUnderline(true);
545 } 577​ }
546 578​
547 if (format.isStrikeThrough(theme())) { 579​ if (format.isStrikeThrough(theme())) {
548 newAttribute->setFontStrikeOut(true); 580​ newAttribute->setFontStrikeOut(true);
549 } 581​ }
582​ }
550 583​
551 newAttribute->setSkipSpellChecking(format.spellCheck()); 584​ newAttribute->setSkipSpellChecking(format.spellCheck());
552 585​
553 array.append(newAttribute); 586​ array.append(newAttribute);
554 } 587​ }
555 return array; 588​ return array;
556} 589​}
557 590​
▲ Show 20 Lines • Show All 111 Lines • Show Last 20 Lines