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

Properly annotate templates with full scope in type hierarchy

Browse Source 
Fix activation of template classes.

Change-Id: I811f505c1c01fa95d74847cb91dd1cf37476534b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2020-12-22 08:29:18 +01:00
parent 936b63b4fc
commit 167651b537
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/cpptools/cppelementevaluator.cpp
View File

@@ -133,7 +133,8 @@ CppDeclarableElement::CppDeclarableElement(Symbol *declaration)
name = overview.prettyName(declaration->name()); name = overview.prettyName(declaration->name());
if (declaration->enclosingScope()->isClass() || if (declaration->enclosingScope()->isClass() ||
declaration->enclosingScope()->isNamespace() || declaration->enclosingScope()->isNamespace() ||
declaration->enclosingScope()->isEnum()) { declaration->enclosingScope()->isEnum() ||
declaration->enclosingScope()->isTemplate()) {
qualifiedName = overview.prettyName(LookupContext::fullyQualifiedName(declaration)); qualifiedName = overview.prettyName(LookupContext::fullyQualifiedName(declaration));
helpIdCandidates = stripName(qualifiedName); helpIdCandidates = stripName(qualifiedName);
} else { } else {
@@ -462,9 +463,23 @@ QFuture<QSharedPointer<CppElement>> CppElementEvaluator::execute(SourceFunction
if (lookupItems.isEmpty()) if (lookupItems.isEmpty())
return createFinishedFuture(); return createFinishedFuture();
const LookupItem &lookupItem = lookupItems.first(); // ### TODO: select best candidate. LookupItem lookupItem;
if (shouldOmitElement(lookupItem, scope))
for (const LookupItem &item : lookupItems) {
if (shouldOmitElement(item, scope))
continue;
Symbol *symbol = item.declaration();
if (!symbol)
continue;
if (!symbol->isClass() && !symbol->isTemplate() && !symbol->isForwardClassDeclaration())
continue;
lookupItem = item;
break;
}
if (!lookupItem.declaration())
return createFinishedFuture(); return createFinishedFuture();
return std::invoke(execFuntion, this, snapshot, lookupItem, typeOfExpression.context()); return std::invoke(execFuntion, this, snapshot, lookupItem, typeOfExpression.context());
} }
@@ -566,6 +581,10 @@ static void handleLookupItemMatch(QFutureInterface<QSharedPointer<CppElement>> &
} }
} }
if (declaration->asTemplate() && declaration->asTemplate()->declaration()
&& declaration->asTemplate()->declaration()->asClass())
declaration = declaration->asTemplate()->declaration()->asClass();
if (futureInterface.isCanceled()) if (futureInterface.isCanceled())
return; return;
QSharedPointer<CppClass> cppClass(new CppClass(declaration)); QSharedPointer<CppClass> cppClass(new CppClass(declaration));