TextEditor: replace generic highlighter with ksyntaxhighlighting

Fixes: QTCREATORBUG-21029
Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/texteditor/texteditorplugin.cpp

@@ -25,16 +25,16 @@
 
 #include "texteditorplugin.h"
 
-#include "texteditor.h"
 #include "findincurrentfile.h"
 #include "findinfiles.h"
 #include "findinopenfiles.h"
 #include "fontsettings.h"
-#include "generichighlighter/manager.h"
+#include "highlighter.h"
 #include "linenumberfilter.h"
 #include "outlinefactory.h"
 #include "plaintexteditorfactory.h"
 #include "snippets/snippetprovider.h"
+#include "texteditor.h"
 #include "texteditoractionhandler.h"
 #include "texteditorsettings.h"
 
@@ -144,9 +144,6 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
             editor->editorWidget()->showContextMenu();
     });
 
-    // Generic highlighter.
-    connect(ICore::instance(), &ICore::coreOpened, Manager::instance(), &Manager::registerHighlightingFiles);
-
     // Add text snippet provider.
     SnippetProvider::registerGroup(Constants::TEXT_SNIPPET_GROUP_ID,
                                     tr("Text", "SnippetProvider"));
@@ -229,6 +226,12 @@ LineNumberFilter *TextEditorPlugin::lineNumberFilter()
     return &m_instance->d->lineNumberFilter;
 }
 
+ExtensionSystem::IPlugin::ShutdownFlag TextEditorPlugin::aboutToShutdown()
+{
+    Highlighter::handleShutdown();
+    return SynchronousShutdown;
+}
+
 void TextEditorPluginPrivate::updateSearchResultsFont(const FontSettings &settings)
 {
     if (auto window = SearchResultWindow::instance()) {