Differential D6837 Diff 17212 duchain/builders/typebuilder.cpp

Changeset View

Standalone View

View Options

duchain/builders/typebuilder.cpp

Context not available.
502 ///FIXME: this is just a hack for https://bugs.kde.org/show_bug.cgi?id=269369 502​ ///FIXME: this is just a hack for https://bugs.kde.org/show_bug.cgi?id=269369
503 /// a proper fix needs full fledged two-pass, i.e. get rid of PreDeclarationBuilder 503​ /// a proper fix needs full fledged two-pass, i.e. get rid of PreDeclarationBuilder
504 // 0 == global lookup and the delcaration is found again... 504​ // 0 == global lookup and the delcaration is found again...
505​
506​ //Actually, this line causes the following "if (classContext)" statement to fail, so this line effectively does nothing
zhigalinUnsubmitted
Not Done

Actually this performs a rescan using CursorInRevision::invalid

zhigalin: Actually this performs a rescan using `CursorInRevision::invalid`
505 classDec = dynamic_cast<ClassDeclaration*>(type->declaration(nullptr)); 507​ classDec = dynamic_cast<ClassDeclaration*>(type->declaration(nullptr));
506 } 508​ }
507 if (classDec) { 509​ if (classDec) {
Context not available.
514 if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) { 516​ if (classDec->isPublicBaseClass(iteratorDecl, currentContext()->topContext())) {
515 /// Qualified identifier for 'current' 517​ /// Qualified identifier for 'current'
516 static const QualifiedIdentifier currentQId(QStringLiteral("current")); 518​ static const QualifiedIdentifier currentQId(QStringLiteral("current"));
517 foreach (Declaration *d, classDec->internalContext()->findDeclarations(currentQId)) { 519​ auto classContext = classDec->internalContext();
518 if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue; 520​ if (classContext) {
519 Q_ASSERT(d->type<FunctionType>()); 521​ foreach (Declaration *d, classContext->findDeclarations(currentQId)) {
520 injectType(d->type<FunctionType>()->returnType()); 522​ if (!dynamic_cast<ClassMethodDeclaration*>(d)) continue;
521 foundType = true; 523​ Q_ASSERT(d->type<FunctionType>());
522 // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString(); 524​ injectType(d->type<FunctionType>()->returnType());
525​ foundType = true;
526​ // qCDebug(DUCHAIN) << "that's it: " << d->type<FunctionType>()->returnType()->toString();
527​ }
523 } 528​ }
524 } 529​ }
525 } 530​ }
Context not available.