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

C++: fix support for typedef of templated typedefs

Browse Source 
Fix:
* code completion
* follow symbols
* find usages

Task-number: QTCREATORBUG-8375
Change-Id: Ia40273fec3dead76acad4695b852a9e53065d8a7
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Przemyslaw Gorszkowski
2013-04-15 12:50:36 +02:00
committed by Erik Verbruggen
parent b782d191cf
commit 564c9b2842
5 changed files with 218 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1882,3 +1882,138 @@ void CppToolsPlugin::test_completion_QTCREATORBUG9098()
QVERIFY(completions.contains(QLatin1String("c")));
QVERIFY(completions.contains(QLatin1String("B")));
}
void CppToolsPlugin::test_completion_typedef_of_templated_typedef_QTCREATORBUG8375()
{
TestData data;
data.srcText =
"struct Foo\n"
"{ void bar(); };\n"
"struct A\n"
"{ typedef Foo AFoo; };\n"
"template <class T>\n"
"struct B\n"
"{ typedef typename T::AFoo BFoo; };\n"
"struct C : public B<A>\n"
"{\n"
" void test()\n"
" {\n"
" BFoo foo;\n"
" @\n"
" // padding so we get the scope right\n"
" }\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("foo.");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("Foo")));
QVERIFY(completions.contains(QLatin1String("bar")));
}
void CppToolsPlugin::test_completion_typedef_with_the_same_base_name_and_new_type_name()
{
TestData data;
data.srcText =
"namespace A\n"
"{\n"
"struct A { int aa; };\n"
"}\n"
"struct S\n"
"{\n"
" typedef A::A A;\n"
" A a;\n"
"};\n"
"void fun()\n"
"{\n"
" S s;\n"
" @\n"
" // padding so we get the scope right\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("s.a.");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("A")));
QVERIFY(completions.contains(QLatin1String("aa")));
}
void CppToolsPlugin::test_completion_qualified_typedef_1()
{
TestData data;
data.srcText =
"struct S\n"
"{\n"
" typedef S::type type;\n"
"};\n"
"void fun()\n"
"{\n"
" @\n"
" // padding so we get the scope right\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("S::");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("S")));
QVERIFY(completions.contains(QLatin1String("type")));
}
void CppToolsPlugin::test_completion_qualified_typedef_2()
{
TestData data;
data.srcText =
"template <typename T>\n"
"struct S\n"
"{\n"
" typedef S<T>::type type;\n"
"};\n"
"void fun()\n"
"{\n"
" @\n"
" // padding so we get the scope right\n"
"};\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("S<int>::");
change.insert(data.pos, txt);
QTextCursor cursor(data.doc);
change.apply(&cursor);
data.pos += txt.length();
QStringList completions = getCompletions(data);
QCOMPARE(completions.size(), 2);
QVERIFY(completions.contains(QLatin1String("S")));
QVERIFY(completions.contains(QLatin1String("type")));
}

5
src/plugins/cpptools/cpptoolsplugin.h
View File

@@ -124,6 +124,11 @@ private slots:
void test_completion_typedef_using_templates2();
void test_completion_namespace_alias_with_many_namespace_declarations();
void test_completion_QTCREATORBUG9098();
void test_completion_typedef_of_templated_typedef_QTCREATORBUG8375();
void test_completion_typedef_with_the_same_base_name_and_new_type_name();
void test_completion_qualified_typedef_1();
void test_completion_qualified_typedef_2();
void test_format_pointerdeclaration_in_simpledeclarations();
void test_format_pointerdeclaration_in_simpledeclarations_data();