feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Generic highlighter: Try mime type aliases when looking for definitions

Browse Source 
For example the yaml highlighting file declares text/yaml as the
supported mime type, but that is not the canonical name, which is
application/x-yaml.

Change-Id: If9e3f5e31bc5593a82cbbdac916ef41b0d23de7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2022-09-20 13:39:36 +02:00
parent 49190e989e
commit ccfd472a8c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/texteditor/highlighter.cpp
View File

@@ -119,8 +119,15 @@ Highlighter::Definitions Highlighter::definitionsForDocument(const TextDocument
} }
if (definitions.isEmpty()) { if (definitions.isEmpty()) {
const MimeType &mimeType = Utils::mimeTypeForName(document->mimeType()); const MimeType &mimeType = Utils::mimeTypeForName(document->mimeType());
if (mimeType.isValid()) if (mimeType.isValid()) {
definitions = definitionsForMimeType(mimeType.name()); // highlight definitions might not use the canonical name but an alias
const QStringList names = QStringList(mimeType.name()) + mimeType.aliases();
for (const QString &name : names) {
definitions = definitionsForMimeType(name);
if (!definitions.isEmpty())
break;
}
}
} }
return definitions; return definitions;