C++: instantiate template with default argument

Fix code completion for instantiation of template with default argument

Change-Id: I57b0306cc4540400ae83724db6c8b6b1aa67c255
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

1 files changed, 73 insertions, 0 deletions

diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 51da35ad51..20b02c435c 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -1328,6 +1328,79 @@ void CppToolsPlugin::test_completion_instantiate_nested_of_nested_class_when_enc
     QVERIFY(completions.contains(QLatin1String("foo_i")));
 }
 
+void CppToolsPlugin::test_completion_instantiate_template_with_default_argument_type()
+{
+    TestData data;
+    data.srcText = "\n"
+            "struct Foo\n"
+            "{\n"
+            "    int bar;\n"
+            "};\n"
+            "\n"
+            "template <typename T = Foo>\n"
+            "struct Template\n"
+            "{\n"
+            "    T t;\n"
+            "};\n"
+            "\n"
+            "Template<> templateWithDefaultTypeOfArgument;\n"
+            "@\n"
+            ;
+    setup(&data);
+
+    Utils::ChangeSet change;
+    QString txt = QLatin1String("templateWithDefaultTypeOfArgument.t.");
+    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_instantiate_template_with_default_argument_type_as_template()
+{
+    TestData data;
+    data.srcText = "\n"
+            "struct Foo\n"
+            "{\n"
+            "    int bar;\n"
+            "};\n"
+            "\n"
+            "template <typename T>\n"
+            "struct TemplateArg\n"
+            "{\n"
+            "    T t;\n"
+            "};\n"
+            "template <typename T, typename S = TemplateArg<T> >\n"
+            "struct Template\n"
+            "{\n"
+            "    S s;\n"
+            "};\n"
+            "\n"
+            "Template<Foo> templateWithDefaultTypeOfArgument;\n"
+            "@\n"
+            ;
+    setup(&data);
+
+    Utils::ChangeSet change;
+    QString txt = QLatin1String("templateWithDefaultTypeOfArgument.s.t.");
+    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_member_access_operator_1()
 {
     TestData data;