From d574a97a353264206e44f8f109b4fd0ee789b21c Mon Sep 17 00:00:00 2001 From: Andreas Gattringer Date: Mon, 15 Jul 2024 15:46:15 +0200 Subject: [PATCH] take the correct filename for synthax highlighting in code block --- src/models/messagecontentmodel.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/models/messagecontentmodel.cpp b/src/models/messagecontentmodel.cpp index 43491fbe3..b8788ef8c 100644 --- a/src/models/messagecontentmodel.cpp +++ b/src/models/messagecontentmodel.cpp @@ -446,14 +446,16 @@ QList MessageContentModel::componentsForType(MessageComponentT Q_ASSERT(event->content() != nullptr && event->content()->fileInfo() != nullptr); const QMimeType mimeType = event->content()->fileInfo()->mimeType; if (mimeType.name() == QStringLiteral("text/plain") || mimeType.parentMimeTypes().contains(QStringLiteral("text/plain"))) { - KSyntaxHighlighting::Repository repository; - KSyntaxHighlighting::Definition definitionForFile = repository.definitionForFileName(fileTransferInfo.localPath.path()); - if (!definitionForFile.isValid()) { - definitionForFile = repository.definitionForFileName(event->content()->fileInfo()->originalName); + QString originalName = event->content()->fileInfo()->originalName; + if (originalName.isEmpty()) { + originalName = event->plainBody(); } + KSyntaxHighlighting::Repository repository; + KSyntaxHighlighting::Definition definitionForFile = repository.definitionForFileName(originalName); if (!definitionForFile.isValid()) { definitionForFile = repository.definitionForMimeType(mimeType.name()); } + QFile file(fileTransferInfo.localPath.path()); file.open(QIODevice::ReadOnly); components += MessageComponent{MessageComponentType::Code,