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

C++: fix support for nested anonymous class

Browse Source 
The case when anonymous class is inside function. Fixed:
* highlighting
* completion

Task-number: QTCREATORBUG-11711
Change-Id: Ic8fc5fdfb1aed62a74bf148ab7ed449d08214dda
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Przemyslaw Gorszkowski
2014-03-14 08:24:54 +01:00
committed by Erik Verbruggen
parent 31cad45c0e
commit 6bf75acac7
4 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -1513,6 +1513,20 @@ void CppToolsPlugin::test_completion_data()
) << _("nestedOfNestedAnonymousClass.") << (QStringList()
<< QLatin1String("memberOfNestedOfNestedAnonymousClass"));
QTest::newRow("nested_anonymous_class_inside_function") << _(
"void fun()\n"
"{\n"
" union\n"
" {\n"
" int foo1;\n"
" int foo2;\n"
" };\n"
" @\n"
"};\n"
) << _("foo") << (QStringList()
<< QLatin1String("foo1")
<< QLatin1String("foo2"));
QTest::newRow("crash_cloning_template_class_QTCREATORBUG9329") << _(
"struct A {};\n"
"template <typename T>\n"

7
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -1344,6 +1344,11 @@ void CppCompletionAssistProcessor::globalCompletion(CPlusPlus::Scope *currentSco
if (UsingNamespaceDirective *u = member->asUsingNamespaceDirective()) {
if (ClassOrNamespace *b = binding->lookupType(u->name()))
usingBindings.append(b);
} else if (Class *c = member->asClass()) {
if (c->name()->isAnonymousNameId()) {
if (ClassOrNamespace *b = binding->findBlock(block))
completeClass(b);
}
}
}
}
@@ -1539,6 +1544,8 @@ void CppCompletionAssistProcessor::completeClass(CPlusPlus::ClassOrNamespace *b,
foreach (Symbol *bb, binding->symbols()) {
if (Class *k = bb->asClass())
scopesToVisit.append(k);
else if (Block *b = bb->asBlock())
scopesToVisit.append(b);
}
foreach (Enum *e, binding->unscopedEnums())