From 5effb95ad964136871b78a644d0725cd7f739706 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 10 Mar 2023 19:50:37 +0100
Subject: [PATCH] ClangGlobalSymbolFilter: Don't remove duplicates prematurely

That's being done later, inside Core::Internal::runSearch().

Change-Id: Ib131aefdb39dbe2dfd457020ff13f1c453814597
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../clangcodemodel/clangdlocatorfilters.cpp      | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
index 84b0171cbe3..4da1ece4cc8 100644
--- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
+++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp
@@ -151,21 +151,7 @@ void ClangGlobalSymbolFilter::prepareSearch(const QString &entry)
 QList<LocatorFilterEntry> ClangGlobalSymbolFilter::matchesFor(
         QFutureInterface<LocatorFilterEntry> &future, const QString &entry)
 {
-    QList<LocatorFilterEntry> matches = m_cppFilter->matchesFor(future, entry);
-    const QList<LocatorFilterEntry> lspMatches = m_lspFilter->matchesFor(future, entry);
-    if (!lspMatches.isEmpty()) {
-        QSet<Link> locations;
-        for (const auto &entry : std::as_const(matches)) {
-            QTC_ASSERT(entry.linkForEditor, continue);
-            locations.insert(*entry.linkForEditor);
-        }
-        for (const auto &entry : lspMatches) {
-            QTC_ASSERT(entry.linkForEditor, continue);
-            if (!locations.contains(*entry.linkForEditor))
-                matches << entry; // TODO: Insert sorted?
-        }
-    }
-    return matches;
+    return m_cppFilter->matchesFor(future, entry) + m_lspFilter->matchesFor(future, entry);
 }
 
 ClangClassesFilter::ClangClassesFilter()