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

LanguageClient: Fix current document filter

Browse Source 
The DocumentSymbol is an hierarchical symbol format so we also need to
take childrens into account when using the current document locator
filter.

Change-Id: I57f11e8f1781893613719102f87e5a2b2d0af941
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-10-01 10:40:53 +02:00
parent 2de32e3aa8
commit a38a703368
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/languageclient/locatorfilter.cpp
View File

@@ -111,6 +111,15 @@ Core::LocatorFilterEntry generateLocatorEntry(const SymbolInformation &info,
return entry; return entry;
} }
QList<Core::LocatorFilterEntry> generateLocatorEntries(const SymbolInformation &info,
Core::ILocatorFilter *filter,
const QRegularExpression &regexp)
{
if (!regexp.match(info.name()).hasMatch())
return { generateLocatorEntry(info, filter) };
return {};
}
Core::LocatorFilterEntry generateLocatorEntry(const DocumentSymbol &info, Core::LocatorFilterEntry generateLocatorEntry(const DocumentSymbol &info,
Core::ILocatorFilter *filter) Core::ILocatorFilter *filter)
{ {
@@ -125,6 +134,19 @@ Core::LocatorFilterEntry generateLocatorEntry(const DocumentSymbol &info,
return entry; return entry;
} }
QList<Core::LocatorFilterEntry> generateLocatorEntries(const DocumentSymbol &info,
Core::ILocatorFilter *filter,
const QRegularExpression &regexp)
{
QList<Core::LocatorFilterEntry> entries;
if (regexp.match(info.name()).hasMatch())
entries << generateLocatorEntry(info, filter);
const QList<DocumentSymbol> children = info.children().value_or(QList<DocumentSymbol>());
for (const DocumentSymbol &child : children)
entries << generateLocatorEntries(child, filter, regexp);
return entries;
}
template<class T> template<class T>
QList<Core::LocatorFilterEntry> DocumentLocatorFilter::generateEntries(const QList<T> &list, QList<Core::LocatorFilterEntry> DocumentLocatorFilter::generateEntries(const QList<T> &list,
const QString &filter) const QString &filter)
@@ -138,11 +160,8 @@ QList<Core::LocatorFilterEntry> DocumentLocatorFilter::generateEntries(const QLi
if (!regexp.isValid()) if (!regexp.isValid())
return entries; return entries;
for (const T &item : list) { for (const T &item : list)
QRegularExpressionMatch match = regexp.match(item.name()); entries << generateLocatorEntries(item, this, regexp);
if (match.hasMatch())
entries << generateLocatorEntry(item, this);
}
return entries; return entries;
} }