From e029aaadfc3031b1769ffe84b6136978381b1f71 Mon Sep 17 00:00:00 2001 From: James Graham Date: Mon, 4 Mar 2024 18:05:25 +0000 Subject: [PATCH] No Code String Convert 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 --- autotests/texthandlertest.cpp | 2 +- src/texthandler.cpp | 23 +---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/autotests/texthandlertest.cpp b/autotests/texthandlertest.cpp index 8cfeef1d1..d62124b97 100644 --- a/autotests/texthandlertest.cpp +++ b/autotests/texthandlertest.cpp @@ -513,7 +513,7 @@ void TextHandlerTest::componentOutput_data() << QList{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}, MessageComponent{MessageComponentType::Code, QStringLiteral("Some code"), - QVariantMap{{QStringLiteral("class"), QStringLiteral("HTML")}}}}; + QVariantMap{{QStringLiteral("class"), QStringLiteral("html")}}}}; QTest::newRow("quote") << QStringLiteral("

Text

\n
\n

blockquote

\n
") << QList{MessageComponent{MessageComponentType::Text, QStringLiteral("Text"), {}}, MessageComponent{MessageComponentType::Quote, QStringLiteral("\"blockquote\""), {}}}; diff --git a/src/texthandler.cpp b/src/texthandler.cpp index 48394c9ca..f0938858c 100644 --- a/src/texthandler.cpp +++ b/src/texthandler.cpp @@ -697,28 +697,7 @@ QString TextHandler::emoteString(const NeoChatRoom *room, const Quotient::RoomEv QString TextHandler::convertCodeLanguageString(const QString &languageString) { const int equalsPos = languageString.indexOf(u'-'); - auto data = 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; + return languageString.right(languageString.length() - equalsPos - 1); } #include "moc_texthandler.cpp"