summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r--src/plugins/cpptools/cppcompletion_test.cpp43
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.h1
2 files changed, 44 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 5823ad702e..4df7400978 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -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);
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 1c026685fe..c338a24dfe 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -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();