ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No Code String Convert

Browse Source 
No need to try and convert code strings anymore this is now handled in KSyntaxHighlighter

see frameworks/syntax-highlighting!603 and frameworks/syntax-highlighting!604
This commit is contained in:
James Graham
2024-03-04 18:05:25 +00:00
parent f6efa35ed2
commit e029aaadfc
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/texthandlertest.cpp
View File

@@ -513,7 +513,7 @@ void TextHandlerTest::componentOutput_data()
<< QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}, << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
MessageComponent{MessageComponentType::Code, MessageComponent{MessageComponentType::Code,
QStringLiteral("Some code"), QStringLiteral("Some code"),
QVariantMap{{QStringLiteral("class"), QStringLiteral("HTML")}}}}; QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}};
QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>") QTest::newRow("quote") << QStringLiteral("<p>Text</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>")
<< QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}, << QList<MessageComponent>{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}},
MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}}; MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}};

23
src/texthandler.cpp
View File

@@ -697,28 +697,7 @@ QString TextHandler::emoteString(const NeoChatRoom *room, const Quotient::RoomEv
QString TextHandler::convertCodeLanguageString(const QString &languageString) QString TextHandler::convertCodeLanguageString(const QString &languageString)
{ {
const int equalsPos = languageString.indexOf(u'-'); const int equalsPos = languageString.indexOf(u'-');
auto data = languageString.right(languageString.length() - equalsPos - 1); return languageString.right(languageString.length() - equalsPos - 1);
// The standard markdown syntax uses lower case. This will get a subgroup of
// single word languages to work.
if (data.first(1).isLower()) {
data[0] = data[0].toUpper();
}
if (data == QStringLiteral("Cpp")) {
data = QStringLiteral("C++");
}
if (data == QStringLiteral("Json")) {
data = QStringLiteral("JSON");
}
if (data == QStringLiteral("Html")) {
data = QStringLiteral("HTML");
}
if (data == QStringLiteral("Qml")) {
data = QStringLiteral("QML");
}
return data;
} }
#include "moc_texthandler.cpp" #include "moc_texthandler.cpp"