1 files changed, 16 insertions, 34 deletions
diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.h b/src/plugins/clangcodemodel/clangdlocatorfilters.h
index f7deacc7605..1aba669417e 100644
--- a/src/plugins/clangcodemodel/clangdlocatorfilters.h
+++ b/src/plugins/clangcodemodel/clangdlocatorfilters.h
@@ -5,60 +5,42 @@
 
 #include <coreplugin/locator/ilocatorfilter.h>
 
-namespace LanguageClient { class WorkspaceLocatorFilter; }
+namespace ClangCodeModel::Internal {
 
-namespace ClangCodeModel {
-namespace Internal {
-
-class ClangGlobalSymbolFilter : public Core::ILocatorFilter
+class ClangdAllSymbolsFilter : public Core::ILocatorFilter
 {
 public:
-    ClangGlobalSymbolFilter();
-    ClangGlobalSymbolFilter(Core::ILocatorFilter *cppFilter,
-                            LanguageClient::WorkspaceLocatorFilter *lspFilter);
-    ~ClangGlobalSymbolFilter() override;
+    ClangdAllSymbolsFilter();
 
 private:
-    void prepareSearch(const QString &entry) override;
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
-                                               const QString &entry) override;
-    void accept(const Core::LocatorFilterEntry &selection, QString *newText,
-                int *selectionStart, int *selectionLength) const override;
-
-    Core::ILocatorFilter * const m_cppFilter;
-    LanguageClient::WorkspaceLocatorFilter * const m_lspFilter;
+    Core::LocatorMatcherTasks matchers() final;
 };
 
-class ClangClassesFilter : public ClangGlobalSymbolFilter
+class ClangdClassesFilter : public Core::ILocatorFilter
 {
 public:
-    ClangClassesFilter();
+    ClangdClassesFilter();
+
+private:
+    Core::LocatorMatcherTasks matchers() final;
 };
 
-class ClangFunctionsFilter : public ClangGlobalSymbolFilter
+class ClangdFunctionsFilter : public Core::ILocatorFilter
 {
 public:
-    ClangFunctionsFilter();
+    ClangdFunctionsFilter();
+
+private:
+    Core::LocatorMatcherTasks matchers() final;
 };
 
 class ClangdCurrentDocumentFilter : public Core::ILocatorFilter
 {
 public:
     ClangdCurrentDocumentFilter();
-    ~ClangdCurrentDocumentFilter() override;
-
-    void updateCurrentClient();
 
 private:
-    void prepareSearch(const QString &entry) override;
-    QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
-                                               const QString &entry) override;
-    void accept(const Core::LocatorFilterEntry &selection, QString *newText,
-                int *selectionStart, int *selectionLength) const override;
-
-    class Private;
-    Private * const d;
+    Core::LocatorMatcherTasks matchers() final;
 };
 
-} // namespace Internal
-} // namespace ClangCodeModel
+} // namespace ClangCodeModel::Internal