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

Revert "Minor: Extract lambda return expression handling"

Browse Source 
This reverts commit 55038e19
This commit is contained in:
Yan Zhulanow
2020-10-24 00:20:30 +09:00
parent b18de1e3ff
commit 601198634d
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToLabeledReturnFix.kt
+13 -19
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.KotlinBundle
@@ -63,28 +62,23 @@ class ChangeToLabeledReturnFix(
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> { override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val element = diagnostic.psiElement as? KtElement ?: return emptyList() val element = diagnostic.psiElement as? KtElement ?: return emptyList()
val context by lazy { element.analyze() } val context by lazy { element.analyze() }
val returnExpression = when (diagnostic.factory) { val returnExpression = when (diagnostic.factory) {
Errors.RETURN_NOT_ALLOWED -> Errors.RETURN_NOT_ALLOWED -> {
diagnostic.psiElement as? KtReturnExpression diagnostic.psiElement as? KtReturnExpression
Errors.TYPE_MISMATCH, }
Errors.CONSTANT_EXPECTED_TYPE_MISMATCH, Errors.TYPE_MISMATCH, Errors.CONSTANT_EXPECTED_TYPE_MISMATCH, Errors.NULL_FOR_NONNULL_TYPE -> {
Errors.NULL_FOR_NONNULL_TYPE -> val returnExpression = diagnostic.psiElement.getStrictParentOfType<KtReturnExpression>() ?: return emptyList()
getLambdaReturnExpression(diagnostic.psiElement, context) val lambda = returnExpression.getStrictParentOfType<KtLambdaExpression>() ?: return emptyList()
val lambdaReturnType = context[BindingContext.FUNCTION, lambda.functionLiteral]?.returnType ?: return emptyList()
val returnType = returnExpression.returnedExpression?.getType(context) ?: return emptyList()
if (!returnType.isSubtypeOf(lambdaReturnType)) return emptyList()
returnExpression
}
else -> null else -> null
} ?: return emptyList() } ?: return emptyList()
return findAccessibleLabels(context, returnExpression).map {
val candidates = findAccessibleLabels(context, returnExpression) ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${it.render()}")
return candidates.map { ChangeToLabeledReturnFix(returnExpression, labeledReturn = "return@${it.render()}") } }
}
private fun getLambdaReturnExpression(element: PsiElement, bindingContext: BindingContext): KtReturnExpression? {
val returnExpression = element.getStrictParentOfType<KtReturnExpression>() ?: return null
val lambda = returnExpression.getStrictParentOfType<KtLambdaExpression>() ?: return null
val lambdaReturnType = bindingContext[BindingContext.FUNCTION, lambda.functionLiteral]?.returnType ?: return null
val returnType = returnExpression.returnedExpression?.getType(bindingContext) ?: return null
if (!returnType.isSubtypeOf(lambdaReturnType)) return null
return returnExpression
} }
} }
} }