azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create From Usage: Generate type parameters (if any) for all callable declarations

Browse Source
This commit is contained in:
Alexey Sedunov
2014-10-08 17:41:04 +04:00
parent 9206b571f4
commit 0dafcb6728
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt
+3 -3
View File
@@ -109,8 +109,8 @@ private class TypeParameterListExpression(private val typeParameterNamesFromRece
val editor = context.getEditor()!! val editor = context.getEditor()!!
val file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()) as JetFile val file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()) as JetFile
val elementAt = file.findElementAt(offset) val elementAt = file.findElementAt(offset)
val func = PsiTreeUtil.getParentOfType(elementAt, javaClass<JetFunction>()) ?: return TextResult("") val callable = PsiTreeUtil.getParentOfType(elementAt, javaClass<JetCallableDeclaration>()) ?: return TextResult("")
val parameters = func.getValueParameters() val parameters = callable.getValueParameterList()?.getParameters() ?: Collections.emptyList<JetParameter>()
val typeParameterNames = LinkedHashSet<String>() val typeParameterNames = LinkedHashSet<String>()
typeParameterNames.addAll(typeParameterNamesFromReceiverType) typeParameterNames.addAll(typeParameterNamesFromReceiverType)
@@ -123,7 +123,7 @@ private class TypeParameterListExpression(private val typeParameterNamesFromRece
} }
} }
} }
val returnTypeRef = func.getTypeReference() val returnTypeRef = callable.getTypeReference()
if (returnTypeRef != null) { if (returnTypeRef != null) {
val typeParameterNamesFromReturnType = parameterTypeToTypeParameterNamesMap[returnTypeRef.getText()] val typeParameterNamesFromReturnType = parameterTypeToTypeParameterNamesMap[returnTypeRef.getText()]
if (typeParameterNamesFromReturnType != null) { if (typeParameterNamesFromReturnType != null) {