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

CplusPlus: Fix minimal name construction

Browse Source 
... when using declarations are involved.

Fixes: QTCREATORBUG-14524
Change-Id: I0c391b88628f40973b6f601e60c64263f62a88a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-01-28 13:43:22 +01:00
parent 667d50e1bc
commit 87ec0f349f
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,14 @@ LookupContext &LookupContext::operator=(const LookupContext &other)
QList<const Name *> LookupContext::fullyQualifiedName(Symbol *symbol, InlineNamespacePolicy policy)
{
QList<const Name *> qualifiedName = path(symbol->enclosingScope(), policy);
addNames(symbol->name(), &qualifiedName, /*add all names*/ true);
QList<const Name *> symbolNames;
addNames(symbol->name(), &symbolNames, /*add all names*/ true);
if (const UsingDeclaration * const usingDecl = symbol->asUsingDeclaration()) {
if (!symbolNames.isEmpty())
qualifiedName << symbolNames.last();
} else {
qualifiedName << symbolNames;
}
return qualifiedName;
}
@@ -811,7 +818,7 @@ void CreateBindings::lookupInScope(const Name *name, Scope *scope,
continue; // skip using namespace directives
else if (! id->match(s->identifier()))
continue;
else if (s->name() && s->name()->isQualifiedNameId())
else if (s->name() && s->name()->isQualifiedNameId() && !s->asUsingDeclaration())
continue; // skip qualified ids.
if (Q_UNLIKELY(debug)) {