Revert "TextEditor: Hide LineNumberFilter implementation"

Fixes missing "Line in Current Document" locator filter.
Locator filters need to be created during startup.

This reverts commit 8af6d16b6c.

Change-Id: I53ec1c1079b4a719169e8db95b6d77f703264b65
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>

src/plugins/texteditor/linenumberfilter.cpp

@@ -1,21 +1,19 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "linenumberfilter.h"
+
 #include "texteditortr.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/locator/ilocatorfilter.h>
 
 using namespace Core;
 using namespace Utils;
 
 namespace TextEditor::Internal {
 
-class LineNumberFilter : public ILocatorFilter
+LineNumberFilter::LineNumberFilter()
 {
-public:
-    LineNumberFilter()
-    {
     setId("Line in current document");
     setDisplayName(Tr::tr("Line in Current Document"));
     setDescription(Tr::tr("Jumps to the given line in the current document."));
@@ -23,11 +21,10 @@ public:
     setPriority(High);
     setDefaultShortcutString("l");
     setDefaultIncludedByDefault(true);
-    }
+}
 
-private:
-    LocatorMatcherTasks matchers() final
-    {
+LocatorMatcherTasks LineNumberFilter::matchers()
+{
     using namespace Tasking;
 
     TreeStorage<LocatorStorage> storage;
@@ -67,13 +64,6 @@ private:
         }
     };
     return {{Sync(onSetup), storage}};
-    }
-};
-
-ILocatorFilter *lineNumberFilter()
-{
-    static LineNumberFilter theLineNumberFilter;
-    return &theLineNumberFilter;
 }
 
 } // namespace TextEditor::Internal

src/plugins/texteditor/linenumberfilter.h

@@ -3,10 +3,17 @@
 
 #pragma once
 
-namespace Core { class ILocatorFilter; }
+#include <coreplugin/locator/ilocatorfilter.h>
 
 namespace TextEditor::Internal {
 
-Core::ILocatorFilter *lineNumberFilter();
+class LineNumberFilter : public Core::ILocatorFilter
+{
+public:
+    LineNumberFilter();
 
-} // TextEditor::Internal
+private:
+    Core::LocatorMatcherTasks matchers() final;
+};
+
+} // namespace TextEditor::Internal

src/plugins/texteditor/texteditoractionhandler.cpp

@@ -7,6 +7,7 @@
 #include "displaysettings.h"
 #include "fontsettings.h"
 #include "linenumberfilter.h"
+#include "texteditorplugin.h"
 #include "texteditortr.h"
 #include "texteditorsettings.h"
 
@@ -179,7 +180,7 @@ void TextEditorActionHandlerPrivate::createActions()
     registerAction(SELECTALL,
             [] (TextEditorWidget *w) { w->selectAll(); }, true);
     registerAction(GOTO, [] (TextEditorWidget *) {
-            Core::LocatorManager::showFilter(lineNumberFilter());
+            Core::LocatorManager::showFilter(TextEditorPlugin::lineNumberFilter());
         });
     m_modifyingActions << registerAction(PRINT,
             [] (TextEditorWidget *widget) { widget->print(Core::ICore::printer()); });

src/plugins/texteditor/texteditorplugin.cpp

@@ -99,6 +99,7 @@ public:
     FilePath m_marginActionFileName;
 
     TextEditorSettings settings;
+    LineNumberFilter lineNumberFilter; // Goto line functionality for quick open
     OutlineFactory outlineFactory;
 
     FindInFiles findInFilesFilter;
@@ -425,6 +426,11 @@ void TextEditorPlugin::extensionsInitialized()
                                });
 }
 
+LineNumberFilter *TextEditorPlugin::lineNumberFilter()
+{
+    return &m_instance->d->lineNumberFilter;
+}
+
 ExtensionSystem::IPlugin::ShutdownFlag TextEditorPlugin::aboutToShutdown()
 {
     Highlighter::handleShutdown();

src/plugins/texteditor/texteditorplugin.h

@@ -8,6 +8,8 @@
 namespace TextEditor {
 namespace Internal {
 
+class LineNumberFilter;
+
 class TextEditorPlugin final : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
@@ -18,6 +20,7 @@ public:
     ~TextEditorPlugin() final;
 
     static TextEditorPlugin *instance();
+    static LineNumberFilter *lineNumberFilter();
 
     ShutdownFlag aboutToShutdown() override;