From 0dafcb6728e5f77b30f8b3e4fa9294d5db376487 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 8 Oct 2014 17:41:04 +0400
Subject: [PATCH] Create From Usage: Generate type parameters (if any) for all
 callable declarations

---
 .../createFromUsage/callableBuilder/templateExpressions.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
index 1d467f9eef6..68bd923e6b0 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
@@ -109,8 +109,8 @@ private class TypeParameterListExpression(private val typeParameterNamesFromRece
         val editor = context.getEditor()!!
         val file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()) as JetFile
         val elementAt = file.findElementAt(offset)
-        val func = PsiTreeUtil.getParentOfType(elementAt, javaClass<JetFunction>()) ?: return TextResult("")
-        val parameters = func.getValueParameters()
+        val callable = PsiTreeUtil.getParentOfType(elementAt, javaClass<JetCallableDeclaration>()) ?: return TextResult("")
+        val parameters = callable.getValueParameterList()?.getParameters() ?: Collections.emptyList<JetParameter>()
 
         val typeParameterNames = LinkedHashSet<String>()
         typeParameterNames.addAll(typeParameterNamesFromReceiverType)
@@ -123,7 +123,7 @@ private class TypeParameterListExpression(private val typeParameterNamesFromRece
                 }
             }
         }
-        val returnTypeRef = func.getTypeReference()
+        val returnTypeRef = callable.getTypeReference()
         if (returnTypeRef != null) {
             val typeParameterNamesFromReturnType = parameterTypeToTypeParameterNamesMap[returnTypeRef.getText()]
             if (typeParameterNamesFromReturnType != null) {