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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I5e138bb7883c0436fee14ca6af20e99396676af1
This commit is contained in:
Eike Ziller
2020-11-20 13:00:37 +01:00
parent 937850a292 f7fa53d29b
commit 8d67dd57e8
54 changed files with 440 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/cplusplus/LookupContext.cpp
View File

@@ -60,15 +60,22 @@ static void addNames(const Name *name, QList<const Name *> *names, bool addAllNa
}
}
static void path_helper(Symbol *symbol, QList<const Name *> *names)
static void path_helper(Symbol *symbol,
QList<const Name *> *names,
LookupContext::InlineNamespacePolicy policy)
{
if (! symbol)
return;
path_helper(symbol->enclosingScope(), names);
path_helper(symbol->enclosingScope(), names, policy);
if (symbol->name()) {
if (symbol->isClass() || symbol->isNamespace()) {
if (policy == LookupContext::HideInlineNamespaces) {
auto ns = symbol->asNamespace();
if (ns && ns->isInline())
return;
}
addNames(symbol->name(), names);
} else if (symbol->isObjCClass() || symbol->isObjCBaseClass() || symbol->isObjCProtocol()
@@ -206,17 +213,17 @@ LookupContext &LookupContext::operator=(const LookupContext &other)
return *this;
}
QList<const Name *> LookupContext::fullyQualifiedName(Symbol *symbol)
QList<const Name *> LookupContext::fullyQualifiedName(Symbol *symbol, InlineNamespacePolicy policy)
{
QList<const Name *> qualifiedName = path(symbol->enclosingScope());
QList<const Name *> qualifiedName = path(symbol->enclosingScope(), policy);
addNames(symbol->name(), &qualifiedName, /*add all names*/ true);
return qualifiedName;
}
QList<const Name *> LookupContext::path(Symbol *symbol)
QList<const Name *> LookupContext::path(Symbol *symbol, InlineNamespacePolicy policy)
{
QList<const Name *> names;
path_helper(symbol, &names);
path_helper(symbol, &names, policy);
return names;
}

7
src/libs/cplusplus/LookupContext.h
View File

@@ -314,8 +314,11 @@ public:
QSharedPointer<CreateBindings> bindings() const
{ return _bindings; }
static QList<const Name *> fullyQualifiedName(Symbol *symbol);
static QList<const Name *> path(Symbol *symbol);
enum InlineNamespacePolicy { ShowInlineNamespaces, HideInlineNamespaces };
static QList<const Name *> fullyQualifiedName(
Symbol *symbol, InlineNamespacePolicy policy = ShowInlineNamespaces);
static QList<const Name *> path(Symbol *symbol,
InlineNamespacePolicy policy = ShowInlineNamespaces);
static const Name *minimalName(Symbol *symbol, ClassOrNamespace *target, Control *control);