C++: Enable showEnclosingTemplate also for function type

Do not require directly passing the enclosing template.

Change-Id: Ie03bc58338fe003677a5f5311d86d70f499373ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/libs/cplusplus/TypePrettyPrinter.cpp

@@ -182,23 +182,6 @@ void TypePrettyPrinter::visit(Template *type)
             _name += QLatin1Char('>');
         }
         acceptType(d->type());
-        if (oo.showEnclosingTemplate) {
-            QString templateScope = "template<";
-            for (unsigned i = 0, total = type->templateParameterCount(); i < total; ++i) {
-                if (Symbol *param = type->templateParameterAt(i)) {
-                    if (i > 0)
-                        templateScope.append(", ");
-                    if (TypenameArgument *typenameArg = param->asTypenameArgument()) {
-                        templateScope.append(QLatin1String(typenameArg->isClassDeclarator()
-                                                           ? "class " : "typename "));
-                        templateScope.append(oo(typenameArg->name()));
-                    } else if (Argument *arg = param->asArgument()) {
-                        templateScope.append(operator()(arg->type(), oo(arg->name())));
-                    }
-                }
-            }
-            _text.prepend(templateScope + ">\n");
-        }
     }
     prependCv(_fullySpecifiedType);
 }
@@ -424,6 +407,27 @@ void TypePrettyPrinter::visit(Function *type)
         }
     }
 
+    if (_overview->showEnclosingTemplate) {
+        if (Template *templ = type->enclosingTemplate()) {
+            QString templateScope = "template<";
+            for (unsigned i = 0, total = templ->templateParameterCount(); i < total; ++i) {
+                if (Symbol *param = templ->templateParameterAt(i)) {
+                    if (i > 0)
+                        templateScope.append(", ");
+                    if (TypenameArgument *typenameArg = param->asTypenameArgument()) {
+                        templateScope.append(QLatin1String(typenameArg->isClassDeclarator()
+                                                           ? "class " : "typename "));
+                        templateScope.append(_overview->prettyName(typenameArg->name()));
+                    } else if (Argument *arg = param->asArgument()) {
+                        templateScope.append(operator()(arg->type(),
+                                                        _overview->prettyName(arg->name())));
+                    }
+                }
+            }
+            _text.prepend(templateScope + ">\n");
+        }
+    }
+
     if (_overview->showFunctionSignatures) {
         Overview argumentText;
         argumentText.starBindFlags = _overview->starBindFlags;

src/plugins/cppeditor/cppquickfixes.cpp

@@ -2510,13 +2510,8 @@ QString InsertDeclOperation::generateDeclaration(const Function *function)
     oo.showArgumentNames = true;
     oo.showEnclosingTemplate = true;
 
-    const Symbol *symbol = function;
-    if (const Scope *enclosingScope = function->enclosingScope()) {
-        if (const Template *templ = enclosingScope->asTemplate())
-            symbol = templ;
-    }
     QString decl;
-    decl += oo.prettyType(symbol->type(), function->unqualifiedName());
+    decl += oo.prettyType(function->type(), function->unqualifiedName());
     decl += QLatin1String(";\n");
 
     return decl;

tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp

@@ -107,11 +107,13 @@ static FullySpecifiedType fnTy(const QString &name, const FullySpecifiedType &re
     return FullySpecifiedType(fn);
 }
 
-static FullySpecifiedType templTy(const FullySpecifiedType &declTy, bool isClassDeclarator)
+static FullySpecifiedType templTy(FullySpecifiedType declTy, bool isClassDeclarator)
 {
     Template *templ = new Template(0, 0, nameId(""));
     templ->addMember(typenameArg("T", isClassDeclarator));
     templ->addMember(decl(declTy));
+    if (Function *func = declTy->asFunctionType())
+        func->setEnclosingScope(templ);
     return FullySpecifiedType(templ);
 }