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

CppEditor: Accept LookupContext in virtual function lookup

Browse Source 
Required for correct resolving of first virtual appearance

Change-Id: I2307027f769fb2f4c0942f4aa4e0d2b5327562b5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2013-11-10 23:14:17 +02:00
committed by Orgad Shaneh
parent a28005dacc
commit 056db85657
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
View File

@@ -128,11 +128,13 @@ bool VirtualFunctionHelper::canLookupVirtualFunctionOverrides(Function *function
if (IdExpressionAST *idExpressionAST = m_baseExpressionAST->asIdExpression()) { if (IdExpressionAST *idExpressionAST = m_baseExpressionAST->asIdExpression()) {
NameAST *name = idExpressionAST->name; NameAST *name = idExpressionAST->name;
const bool nameIsQualified = name && name->asQualifiedName(); const bool nameIsQualified = name && name->asQualifiedName();
result = !nameIsQualified && FunctionHelper::isVirtualFunction(function, m_snapshot); result = !nameIsQualified && FunctionHelper::isVirtualFunction(
function, LookupContext(m_document, m_snapshot));
} else if (MemberAccessAST *memberAccessAST = m_baseExpressionAST->asMemberAccess()) { } else if (MemberAccessAST *memberAccessAST = m_baseExpressionAST->asMemberAccess()) {
NameAST *name = memberAccessAST->member_name; NameAST *name = memberAccessAST->member_name;
const bool nameIsQualified = name && name->asQualifiedName(); const bool nameIsQualified = name && name->asQualifiedName();
if (!nameIsQualified && FunctionHelper::isVirtualFunction(function, m_snapshot)) { if (!nameIsQualified && FunctionHelper::isVirtualFunction(
function, LookupContext(m_document, m_snapshot))) {
TranslationUnit *unit = m_expressionDocument->translationUnit(); TranslationUnit *unit = m_expressionDocument->translationUnit();
QTC_ASSERT(unit, return false); QTC_ASSERT(unit, return false);
m_accessTokenKind = unit->tokenKind(memberAccessAST->access_token); m_accessTokenKind = unit->tokenKind(memberAccessAST->access_token);

19
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -210,7 +210,7 @@ IAssistProcessor *VirtualFunctionAssistProvider::createProcessor() const
enum VirtualType { Virtual, PureVirtual }; enum VirtualType { Virtual, PureVirtual };
static bool isVirtualFunction_helper(const Function *function, static bool isVirtualFunction_helper(const Function *function,
const Snapshot &snapshot, const LookupContext &context,
VirtualType virtualType) VirtualType virtualType)
{ {
if (!function) if (!function)
@@ -222,9 +222,6 @@ static bool isVirtualFunction_helper(const Function *function,
if (function->isVirtual()) if (function->isVirtual())
return true; return true;
const QString filePath = QString::fromUtf8(function->fileName(), function->fileNameLength());
if (Document::Ptr document = snapshot.document(filePath)) {
LookupContext context(document, snapshot);
QList<LookupItem> results = context.lookup(function->name(), function->enclosingScope()); QList<LookupItem> results = context.lookup(function->name(), function->enclosingScope());
if (!results.isEmpty()) { if (!results.isEmpty()) {
const bool isDestructor = function->name()->isDestructorNameId(); const bool isDestructor = function->name()->isDestructorNameId();
@@ -243,19 +240,18 @@ static bool isVirtualFunction_helper(const Function *function,
} }
} }
} }
}
return false; return false;
} }
bool FunctionHelper::isVirtualFunction(const Function *function, const Snapshot &snapshot) bool FunctionHelper::isVirtualFunction(const Function *function, const LookupContext &context)
{ {
return isVirtualFunction_helper(function, snapshot, Virtual); return isVirtualFunction_helper(function, context, Virtual);
} }
bool FunctionHelper::isPureVirtualFunction(const Function *function, const Snapshot &snapshot) bool FunctionHelper::isPureVirtualFunction(const Function *function, const LookupContext &context)
{ {
return isVirtualFunction_helper(function, snapshot, PureVirtual); return isVirtualFunction_helper(function, context, PureVirtual);
} }
QList<Symbol *> FunctionHelper::overrides(Function *function, Class *functionsClass, QList<Symbol *> FunctionHelper::overrides(Function *function, Class *functionsClass,
@@ -342,6 +338,7 @@ void CppEditorPlugin::test_functionhelper_virtualFunctions()
// Iterate through Function symbols // Iterate through Function symbols
Snapshot snapshot; Snapshot snapshot;
snapshot.insert(document); snapshot.insert(document);
const LookupContext context(document, snapshot);
Control *control = document->translationUnit()->control(); Control *control = document->translationUnit()->control();
Symbol **end = control->lastSymbol(); Symbol **end = control->lastSymbol();
for (Symbol **it = control->firstSymbol(); it != end; ++it) { for (Symbol **it = control->firstSymbol(); it != end; ++it) {
@@ -349,8 +346,8 @@ void CppEditorPlugin::test_functionhelper_virtualFunctions()
if (const Function *function = symbol->asFunction()) { if (const Function *function = symbol->asFunction()) {
QTC_ASSERT(!virtualityList.isEmpty(), return); QTC_ASSERT(!virtualityList.isEmpty(), return);
Virtuality virtuality = virtualityList.takeFirst(); Virtuality virtuality = virtualityList.takeFirst();
if (FunctionHelper::isVirtualFunction(function, snapshot)) { if (FunctionHelper::isVirtualFunction(function, context)) {
if (FunctionHelper::isPureVirtualFunction(function, snapshot)) if (FunctionHelper::isPureVirtualFunction(function, context))
QCOMPARE(virtuality, PureVirtual); QCOMPARE(virtuality, PureVirtual);
else else
QCOMPARE(virtuality, Virtual); QCOMPARE(virtuality, Virtual);

4
src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
View File

@@ -74,10 +74,10 @@ class FunctionHelper
{ {
public: public:
static bool isVirtualFunction(const CPlusPlus::Function *function, static bool isVirtualFunction(const CPlusPlus::Function *function,
const CPlusPlus::Snapshot &snapshot); const CPlusPlus::LookupContext &context);
static bool isPureVirtualFunction(const CPlusPlus::Function *function, static bool isPureVirtualFunction(const CPlusPlus::Function *function,
const CPlusPlus::Snapshot &snapshot); const CPlusPlus::LookupContext &context);
static QList<CPlusPlus::Symbol *> overrides(CPlusPlus::Function *function, static QList<CPlusPlus::Symbol *> overrides(CPlusPlus::Function *function,
CPlusPlus::Class *functionsClass, CPlusPlus::Class *functionsClass,