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

C++: Fix code completion for operator ->

Browse Source 
Fix code completion for operator '->' when
returned value is a pointer of typedef(e.g.:std::auto_ptr).
Included unit test.

Task-number: QTCREATORBUG-629
Change-Id: I36b53a3f80b3c99d52791e18ad1244923c1373f6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Przemyslaw Gorszkowski
2012-11-29 14:42:47 +01:00
committed by Nikolai Kosjar
parent 0b3eb65fc9
commit 6b67f24865
3 changed files with 113 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,6 +409,49 @@ void CppToolsPlugin::test_completion_template_6()
QVERIFY(completions.contains(QLatin1String("i")));
}
void CppToolsPlugin::test_completion_template_7()
{
TestData data;
data.srcText = "\n"
"struct Test\n"
"{\n"
" int i;\n"
"};\n"
"\n"
"template<typename T>\n"
"struct TemplateClass\n"
"{\n"
" T* ptr;\n"
"\n"
" typedef T element_type;\n"
" TemplateClass(T* t) : ptr(t) {}\n"
" element_type* operator->()\n"
" {\n"
" return ptr;\n"
" }\n"
"};\n"
"\n"
"TemplateClass<Test> p(new Test);\n"
"@\n"
;
setup(&data);
Utils::ChangeSet change;
QString txt = QLatin1String("p->");
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("Test")));
QVERIFY(completions.contains(QLatin1String("i")));
}
void CppToolsPlugin::test_completion()
{
QFETCH(QByteArray, code);

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

@@ -97,6 +97,7 @@ private slots:
void test_completion_template_4();
void test_completion_template_5();
void test_completion_template_6();
void test_completion_template_7();
void test_completion_template_as_base();
void test_completion_template_as_base_data();
void test_completion_use_global_identifier_as_base_class();