feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangGlobalSymbolFilter: Don't remove duplicates prematurely

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2023-03-10 19:50:37 +01:00
parent cdfe9462af
commit 5effb95ad9
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clangcodemodel/clangdlocatorfilters.cpp
View File

@@ -151,21 +151,7 @@ void ClangGlobalSymbolFilter::prepareSearch(const QString &entry)
QList<LocatorFilterEntry> ClangGlobalSymbolFilter::matchesFor( QList<LocatorFilterEntry> ClangGlobalSymbolFilter::matchesFor(
QFutureInterface<LocatorFilterEntry> &future, const QString &entry) QFutureInterface<LocatorFilterEntry> &future, const QString &entry)
{ {
QList<LocatorFilterEntry> matches = m_cppFilter->matchesFor(future, entry); return m_cppFilter->matchesFor(future, entry) + m_lspFilter->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;
} }
ClangClassesFilter::ClangClassesFilter() ClangClassesFilter::ClangClassesFilter()