diff --git a/autotests/syntaxrepository_test.cpp b/autotests/syntaxrepository_test.cpp
index 4a8b162..f3c7d2b 100644
--- a/autotests/syntaxrepository_test.cpp
+++ b/autotests/syntaxrepository_test.cpp
@@ -1,509 +1,558 @@
 /*
     Copyright (C) 2016 Volker Krause <vkrause@kde.org>
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
     without limitation the rights to use, copy, modify, merge, publish,
     distribute, sublicense, and/or sell copies of the Software, and to
     permit persons to whom the Software is furnished to do so, subject to
     the following conditions:
 
     The above copyright notice and this permission notice shall be included
     in all copies or substantial portions of the Software.
 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "test-config.h"
 
 #include <abstracthighlighter.h>
 #include <definition.h>
 #include <format.h>
 #include <repository.h>
 #include <state.h>
 #include <theme.h>
 
 #include <QFileInfo>
 #include <QObject>
 #include <QStandardPaths>
 #include <qtest.h>
 
 namespace KSyntaxHighlighting {
 
 class NullHighlighter : public AbstractHighlighter
 {
 public:
     using AbstractHighlighter::highlightLine;
     void applyFormat(int offset, int length, const Format &format) Q_DECL_OVERRIDE
     {
         Q_UNUSED(offset);
         Q_UNUSED(length);
         // only here to ensure we don't crash
         format.isDefaultTextStyle(theme());
         format.textColor(theme());
     }
 };
 
 class RepositoryTest : public QObject
 {
     Q_OBJECT
 private:
         Repository m_repo;
 
 private Q_SLOTS:
     void initTestCase()
     {
         QStandardPaths::enableTestMode(true);
         initRepositorySearchPaths(m_repo);
     }
 
     void testDefinitionByExtension_data()
     {
         QTest::addColumn<QString>("fileName");
         QTest::addColumn<QString>("defName");
 
         QTest::newRow("empty") << QString() << QString();
         QTest::newRow("qml") << QStringLiteral("/bla/foo.qml") << QStringLiteral("QML");
         QTest::newRow("glsl") << QStringLiteral("flat.frag") << QStringLiteral("GLSL");
         // the following ones are defined in multiple syntax definitions
         QTest::newRow("c") << QStringLiteral("test.c") << QStringLiteral("C");
         QTest::newRow("c++") << QStringLiteral("test.cpp") << QStringLiteral("C++");
         QTest::newRow("markdown") << QStringLiteral("test.md") << QStringLiteral("Markdown");
 
         QTest::newRow("Makefile 1") << QStringLiteral("Makefile") << QStringLiteral("Makefile");
         QTest::newRow("Makefile 2") << QStringLiteral("/some/path/to/Makefile") << QStringLiteral("Makefile");
         QTest::newRow("Makefile 3") << QStringLiteral("Makefile.am") << QStringLiteral("Makefile");
     }
 
     void testDefinitionByExtension()
     {
         QFETCH(QString, fileName);
         QFETCH(QString, defName);
 
         auto def = m_repo.definitionForFileName(fileName);
         if (defName.isEmpty()) {
             QVERIFY(!def.isValid());
         } else {
             QVERIFY(def.isValid());
             QCOMPARE(def.name(), defName);
         }
     }
 
+    void testDefinitionsForFileName_data()
+    {
+        QTest::addColumn<QString>("fileName");
+        QTest::addColumn<QStringList>("expectedNames");
+
+        QTest::newRow("Matlab") << QStringLiteral("/bla/foo.m")
+                             << (QStringList() << QStringLiteral("Magma") << QStringLiteral("Matlab") << QStringLiteral("Octave") << QStringLiteral("Objective-C"));
+    }
+
+    void testDefinitionsForFileName()
+    {
+        QFETCH(QString, fileName);
+        QFETCH(QStringList, expectedNames);
+
+        const auto defs = m_repo.definitionsForFileName(fileName);
+        QStringList names;
+        for (auto def : defs) {
+            names.push_back(def.name());
+        }
+        QCOMPARE(names, expectedNames);
+    }
+
+    void testDefinitionsForMimeType_data()
+    {
+        QTest::addColumn<QString>("mimeType");
+        QTest::addColumn<QStringList>("expectedNames");
+
+        QTest::newRow("C Header") << QStringLiteral("text/x-chdr")
+                                  << (QStringList() << QStringLiteral("C++")
+                                                    << QStringLiteral("ISO C++")
+                                                    << QStringLiteral("C")
+                                                    << QStringLiteral("GCCExtensions")
+                                                    << QStringLiteral("ANSI C89")
+                                                    << QStringLiteral("SystemC"));
+    }
+
+    void testDefinitionsForMimeType()
+    {
+        QFETCH(QString, mimeType);
+        QFETCH(QStringList, expectedNames);
+
+        const auto defs = m_repo.definitionsForMimeType(mimeType);
+        QStringList names;
+        for (auto def : defs) {
+            names.push_back(def.name());
+        }
+        QCOMPARE(names, expectedNames);
+    }
+
     void testLoadAll()
     {
         for (const auto &def : m_repo.definitions()) {
             QVERIFY(!def.name().isEmpty());
             QVERIFY(!def.translatedName().isEmpty());
             QVERIFY(!def.isValid() || !def.section().isEmpty());
             QVERIFY(!def.isValid() || !def.translatedSection().isEmpty());
             // indirectly trigger loading, as we can't reach that from public API
             // if the loading fails the highlighter will produce empty states
             NullHighlighter hl;
             State initialState;
             hl.setDefinition(def);
             const auto state = hl.highlightLine(QLatin1String("This should not crash } ] ) !"), initialState);
             QVERIFY(!def.isValid() || state != initialState);
         }
     }
 
     void testMetaData()
     {
         auto def = m_repo.definitionForName(QLatin1String("Alerts"));
         QVERIFY(def.isValid());
         QVERIFY(def.extensions().isEmpty());
         QVERIFY(def.mimeTypes().isEmpty());
         QVERIFY(def.version() >= 1.11f);
         QVERIFY(def.isHidden());
         QCOMPARE(def.section(), QLatin1String("Other"));
         QCOMPARE(def.license(), QLatin1String("MIT"));
         QVERIFY(def.author().contains(QLatin1String("Dominik")));
         QFileInfo fi(def.filePath());
         QVERIFY(fi.isAbsolute());
         QVERIFY(def.filePath().endsWith(QLatin1String("alert.xml")));
 
         def = m_repo.definitionForName(QLatin1String("C++"));
         QVERIFY(def.isValid());
         QCOMPARE(def.section(), QLatin1String("Sources"));
         QCOMPARE(def.indenter(), QLatin1String("cstyle"));
         QCOMPARE(def.style(), QLatin1String("C++"));
         QVERIFY(def.mimeTypes().contains(QLatin1String("text/x-c++hdr")));
         QVERIFY(def.extensions().contains(QLatin1String("*.h")));
         QCOMPARE(def.priority(), 9);
 
         def = m_repo.definitionForName(QLatin1String("Apache Configuration"));
         QVERIFY(def.isValid());
         QVERIFY(def.extensions().contains(QLatin1String("httpd.conf")));
         QVERIFY(def.extensions().contains(QLatin1String(".htaccess*")));
     }
 
     void testGeneralMetaData()
     {
         auto def = m_repo.definitionForName(QLatin1String("C++"));
         QVERIFY(def.isValid());
         QVERIFY(!def.indentationBasedFoldingEnabled());
 
         // comment markers
         QCOMPARE(def.singleLineCommentMarker(), QLatin1String("//"));
         QCOMPARE(def.singleLineCommentPosition(), KSyntaxHighlighting::CommentPosition::StartOfLine);
         const auto cppMultiLineCommentMarker = QPair<QString, QString>(QLatin1String("/*"), QLatin1String("*/"));
         QCOMPARE(def.multiLineCommentMarker(), cppMultiLineCommentMarker);
 
         def = m_repo.definitionForName(QLatin1String("Python"));
         QVERIFY(def.isValid());
 
         // indentation
         QVERIFY(def.indentationBasedFoldingEnabled());
         QCOMPARE(def.foldingIgnoreList(), QStringList() << QLatin1String("(?:\\s+|\\s*#.*)"));
 
         // keyword lists
         QVERIFY(!def.keywordLists().isEmpty());
         QVERIFY(def.keywordList(QLatin1String("operators")).contains(QLatin1String("and")));
         QVERIFY(!def.keywordList(QLatin1String("does not exits")).contains(QLatin1String("and")));
     }
 
     void testFormatData()
     {
         auto def = m_repo.definitionForName(QLatin1String("ChangeLog"));
         QVERIFY(def.isValid());
         auto formats = def.formats();
         QVERIFY(!formats.isEmpty());
 
         // verify that the formats are sorted, such that the order matches the order of the itemDatas in the xml files.
         auto sortComparator = [](const KSyntaxHighlighting::Format & lhs, const KSyntaxHighlighting::Format & rhs) {
             return lhs.id() < rhs.id();
         };
         QVERIFY(std::is_sorted(formats.begin(), formats.end(), sortComparator));
 
         // check all names are listed
         QStringList formatNames;
         for (const auto & format : qAsConst(formats)) {
             formatNames.append(format.name());
         }
 
         const QStringList expectedItemDatas = {
             QStringLiteral("Normal Text"),
             QStringLiteral("Name"),
             QStringLiteral("E-Mail"),
             QStringLiteral("Date"),
             QStringLiteral("Entry")
         };
         QCOMPARE(formatNames, expectedItemDatas);
     }
 
     void testIncludedDefinitions()
     {
         auto def = m_repo.definitionForName(QLatin1String("PHP (HTML)"));
         QVERIFY(def.isValid());
         auto defs = def.includedDefinitions();
 
         const QStringList expectedDefinitionNames = {
             QStringLiteral("PHP/PHP"),
             QStringLiteral("Alerts"),
             QStringLiteral("CSS/PHP"),
             QStringLiteral("JavaScript/PHP"),
             QStringLiteral("Doxygen"),
             QStringLiteral("JavaScript React/PHP"),
             QStringLiteral("TypeScript/PHP"),
             QStringLiteral("MustacheJS/PHP"),
             QStringLiteral("Modelines"),
             QStringLiteral("HTML"),
             QStringLiteral("CSS"),
             QStringLiteral("SQL (MySQL)"),
             QStringLiteral("JavaScript"),
             QStringLiteral("JavaScript React"),
             QStringLiteral("TypeScript"),
             QStringLiteral("MustacheJS")
         };
         QStringList definitionNames;
         for (auto d : defs) {
             QVERIFY(d.isValid());
             definitionNames.push_back(d.name());
 
             // already check here a bit to make the test fails better fixable
             if (definitionNames.size() <= expectedDefinitionNames.size()) {
                 QCOMPARE(d.name(), expectedDefinitionNames[definitionNames.size()-1]);
             } else {
                 QCOMPARE(d.name(), QStringLiteral("too many included defs found, first one is this one"));
             }
         }
         QCOMPARE(definitionNames, expectedDefinitionNames);
     }
 
     void testIncludedFormats()
     {
         QStringList definitionNames;
         for (const auto &def : m_repo.definitions()) {
             definitionNames.push_back(def.name());
         }
 
         for (const QString & name : qAsConst(definitionNames)) {
             Repository repo;
             initRepositorySearchPaths(repo);
             auto def = repo.definitionForName(name);
             QCOMPARE(m_repo.definitionForName(name).isValid(), def.isValid());
             auto includedDefs = def.includedDefinitions();
             includedDefs.push_front(def);
 
             // collect all formats, shall be numbered from 1..
             QSet<int> formatIds;
             for (auto d : qAsConst(includedDefs)) {
                 const auto formats = d.formats();
                 for (const auto format : formats) {
                     // no duplicates
                     QVERIFY(!formatIds.contains(format.id()));
                     formatIds.insert(format.id());
                 }
             }
             QVERIFY(!def.isValid() || !formatIds.isEmpty());
 
             // ensure all ids are there from 1..size
             for (int i = 1; i <= formatIds.size(); ++i) {
                 QVERIFY(formatIds.contains(i));
             }
         }
     }
 
     void testReload()
     {
         auto def = m_repo.definitionForName(QLatin1String("QML"));
         QVERIFY(!m_repo.definitions().isEmpty());
         QVERIFY(def.isValid());
 
         NullHighlighter hl;
         hl.setDefinition(def);
         auto oldState = hl.highlightLine(QLatin1String("/* TODO this should not crash */"), State());
 
         m_repo.reload();
         QVERIFY(!m_repo.definitions().isEmpty());
         QVERIFY(!def.isValid());
 
         hl.highlightLine(QLatin1String("/* TODO this should not crash */"), State());
         hl.highlightLine(QLatin1String("/* FIXME neither should this crash */"), oldState);
         QVERIFY(hl.definition().isValid());
         QCOMPARE(hl.definition().name(), QLatin1String("QML"));
     }
 
     void testLifetime()
     {
         // common mistake with value-type like Repo API, make sure this doesn'T crash
         NullHighlighter hl;
         {
             Repository repo;
             hl.setDefinition(repo.definitionForName(QLatin1String("C++")));
             hl.setTheme(repo.defaultTheme());
         }
         hl.highlightLine(QLatin1String("/**! @todo this should not crash .*/"), State());
     }
 
     void testCustomPath()
     {
         QString testInputPath = QStringLiteral(TESTSRCDIR "/input");
 
         Repository repo;
         QVERIFY(repo.customSearchPaths().empty());
         repo.addCustomSearchPath(testInputPath);
         QCOMPARE(repo.customSearchPaths().size(), 1);
         QCOMPARE(repo.customSearchPaths()[0], testInputPath);
 
         auto customDefinition = repo.definitionForName(QLatin1String("Test Syntax"));
         QVERIFY(customDefinition.isValid());
         auto customTheme = repo.theme(QLatin1String("Test Theme"));
         QVERIFY(customTheme.isValid());
     }
 
     void testInvalidDefinition()
     {
         Definition def;
         QVERIFY(!def.isValid());
         QVERIFY(def.filePath().isEmpty());
         QCOMPARE(def.name(), QLatin1String("None"));
         QVERIFY(def.section().isEmpty());
         QVERIFY(def.translatedSection().isEmpty());
         QVERIFY(def.mimeTypes().isEmpty());
         QVERIFY(def.extensions().isEmpty());
         QCOMPARE(def.version(), 0);
         QCOMPARE(def.priority(), 0);
         QVERIFY(!def.isHidden());
         QVERIFY(def.style().isEmpty());
         QVERIFY(def.indenter().isEmpty());
         QVERIFY(def.author().isEmpty());
         QVERIFY(def.license().isEmpty());
         QVERIFY(!def.foldingEnabled());
         QVERIFY(!def.indentationBasedFoldingEnabled());
         QVERIFY(def.foldingIgnoreList().isEmpty());
         QVERIFY(def.keywordLists().isEmpty());
         QVERIFY(def.formats().isEmpty());
         QVERIFY(def.includedDefinitions().isEmpty());
         QVERIFY(def.singleLineCommentMarker().isEmpty());
         QCOMPARE(def.singleLineCommentPosition(), KSyntaxHighlighting::CommentPosition::StartOfLine);
         const auto emptyPair = QPair<QString, QString>();
         QCOMPARE(def.multiLineCommentMarker(), emptyPair);
         QVERIFY(def.characterEncodings().isEmpty());
 
 
         for (QChar c : QStringLiteral("\t !%&()*+,-./:;<=>?[\\]^{|}~")) {
             QVERIFY(def.isWordDelimiter(c));
             QVERIFY(def.isWordWrapDelimiter(c));
         }
     }
 
     void testDelimiters()
     {
         auto def = m_repo.definitionForName(QLatin1String("LaTeX"));
         QVERIFY(def.isValid());
 
         // check that backslash '\' is removed
         for (QChar c : QStringLiteral("\t !%&()*+,-./:;<=>?[]^{|}~"))
             QVERIFY(def.isWordDelimiter(c));
         QVERIFY(!def.isWordDelimiter(QLatin1Char('\\')));
 
         // check where breaking a line is valid
         for (QChar c : QStringLiteral(",{}[]"))
             QVERIFY(def.isWordWrapDelimiter(c));
     }
 
     void testFoldingEnabled()
     {
         // test invalid folding
         Definition def;
         QVERIFY(!def.isValid());
         QVERIFY(!def.foldingEnabled());
         QVERIFY(!def.indentationBasedFoldingEnabled());
 
         // test no folding
         def = m_repo.definitionForName(QLatin1String("ChangeLog"));
         QVERIFY(def.isValid());
         QVERIFY(!def.foldingEnabled());
         QVERIFY(!def.indentationBasedFoldingEnabled());
 
         // C++ itself has no regions, but it includes ISO C++
         def = m_repo.definitionForName(QLatin1String("C++"));
         QVERIFY(def.isValid());
         QVERIFY(def.foldingEnabled());
         QVERIFY(!def.indentationBasedFoldingEnabled());
 
         // ISO C++ itself has folding regions
         def = m_repo.definitionForName(QLatin1String("ISO C++"));
         QVERIFY(def.isValid());
         QVERIFY(def.foldingEnabled());
         QVERIFY(!def.indentationBasedFoldingEnabled());
 
         // Python has indentation based folding
         def = m_repo.definitionForName(QLatin1String("Python"));
         QVERIFY(def.isValid());
         QVERIFY(def.foldingEnabled());
         QVERIFY(def.indentationBasedFoldingEnabled());
     }
 
     void testCharacterEncodings()
     {
         auto def = m_repo.definitionForName(QLatin1String("LaTeX"));
         QVERIFY(def.isValid());
         const auto encodings = def.characterEncodings();
         QVERIFY(!encodings.isEmpty());
         QVERIFY(encodings.contains({ QChar(196), QLatin1String("\\\"{A}") }));
         QVERIFY(encodings.contains({ QChar(227), QLatin1String("\\~{a}") }));
     }
 
     void testIncludeKeywordLists()
     {
         Repository repo;
         QTemporaryDir dir;
 
         // forge a syntax file
         {
             QVERIFY(QDir(dir.path()).mkpath(QLatin1String("syntax")));
 
             const char syntax[] = R"xml(<?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE language SYSTEM "language.dtd">
             <language version="1" kateversion="5.1" name="AAA" section="Other" extensions="*.a" mimetype="" author="" license="MIT">
               <highlighting>
                 <list name="a">
                   <include>c</include>
                   <item>a</item>
                 </list>
                 <list name="b">
                   <item>b</item>
                   <include>a</include>
                 </list>
                 <list name="c">
                   <item>c</item>
                   <include>b</include>
                 </list>
 
                 <list name="d">
                   <item>d</item>
                   <include>e##AAA</include>
                 </list>
                 <list name="e">
                   <item>e</item>
                   <include>f</include>
                 </list>
                 <list name="f">
                   <item>f</item>
                 </list>
                 <contexts>
                   <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
                     <keyword attribute="x" context="#stay" String="a" />
                   </context>
                 </contexts>
                 <itemDatas>
                   <itemData name="Normal Text" defStyleNum="dsNormal"/>
                   <itemData name="x" defStyleNum="dsAlert" />
                 </itemDatas>
               </highlighting>
             </language>
             )xml";
 
             QFile file(dir.path() + QLatin1String("/syntax/a.xml"));
             QVERIFY(file.open(QIODevice::WriteOnly));
             QTextStream stream(&file);
             stream << syntax;
         }
 
         repo.addCustomSearchPath(dir.path());
         auto def = repo.definitionForName(QLatin1String("AAA"));
         QCOMPARE(def.name(), QLatin1String("AAA"));
 
         auto klist1 = def.keywordList(QLatin1String("a"));
         auto klist2 = def.keywordList(QLatin1String("b"));
         auto klist3 = def.keywordList(QLatin1String("c"));
 
         // internal QHash<QString, KeywordList> is arbitrarily ordered and undeterministic
         auto& klist = klist1.size() == 3 ? klist1
                     : klist2.size() == 3 ? klist2
                     : klist3;
 
         QCOMPARE(klist.size(), 3);
         QVERIFY(klist.contains(QLatin1String("a")));
         QVERIFY(klist.contains(QLatin1String("b")));
         QVERIFY(klist.contains(QLatin1String("c")));
 
         klist = def.keywordList(QLatin1String("d"));
         QCOMPARE(klist.size(), 3);
         QVERIFY(klist.contains(QLatin1String("d")));
         QVERIFY(klist.contains(QLatin1String("e")));
         QVERIFY(klist.contains(QLatin1String("f")));
 
         klist = def.keywordList(QLatin1String("e"));
         QCOMPARE(klist.size(), 2);
         QVERIFY(klist.contains(QLatin1String("e")));
         QVERIFY(klist.contains(QLatin1String("f")));
 
         klist = def.keywordList(QLatin1String("f"));
         QCOMPARE(klist.size(), 1);
         QVERIFY(klist.contains(QLatin1String("f")));
     }
 };
 }
 
 QTEST_GUILESS_MAIN(KSyntaxHighlighting::RepositoryTest)
 
 #include "syntaxrepository_test.moc"