1 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 7a301e3899..8e5aaacbad 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -8499,14 +8499,8 @@ void TextEditorWidget::configureGenericHighlighter()
 
     setCodeFoldingSupported(false);
 
-    const QString type = textDocument()->mimeType();
-    const MimeType mimeType = Utils::mimeTypeForName(type);
-    const QString fileName = textDocument()->filePath().fileName();
-    KSyntaxHighlighting::Definition definition;
-    if (mimeType.isValid())
-        definition = Highlighter::definitionForMimeType(mimeType.name());
-    if (!definition.isValid())
-        definition = Highlighter::definitionForFileName(fileName);
+    const KSyntaxHighlighting::Definition definition =
+        Highlighter::definitionForDocument(textDocument());
 
     if (definition.isValid()) {
         highlighter->setDefinition(definition);
@@ -8518,7 +8512,8 @@ void TextEditorWidget::configureGenericHighlighter()
     }
 
     d->updateSyntaxInfoBar(!definition.isValid()
-            && !TextEditorSettings::highlighterSettings().isIgnoredFilePattern(fileName));
+            && !TextEditorSettings::highlighterSettings().isIgnoredFilePattern(
+                                  textDocument()->filePath().fileName()));
 
     textDocument()->setFontSettings(TextEditorSettings::fontSettings());
 }