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

Minor refactoring: convert to block body

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-05-24 14:31:51 +03:00
parent fa5e284bf8
commit 9e487a6326
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
+6 -6
View File
@@ -19,12 +19,13 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.codeInsight.intention.LowPriorityAction import com.intellij.codeInsight.intention.LowPriorityAction
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.typeUtil.isNothing
import org.jetbrains.kotlin.types.typeUtil.isUnit
class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody>( class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody>(
KtDeclarationWithBody::class.java, "Convert to block body" KtDeclarationWithBody::class.java, "Convert to block body"
@@ -62,12 +63,11 @@ class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody
fun convert(declaration: KtDeclarationWithBody): KtDeclarationWithBody { fun convert(declaration: KtDeclarationWithBody): KtDeclarationWithBody {
val body = declaration.bodyExpression!! val body = declaration.bodyExpression!!
fun generateBody(returnsValue: Boolean): KtExpression { fun generateBody(returnsValue: Boolean): KtExpression {
val bodyType = body.analyze().getType(body) val bodyType = body.analyze().getType(body)
val unitWhenAsResult = (bodyType == null || KotlinBuiltIns.isUnit(bodyType)) && body.whenAsResult() val unitWhenAsResult = (bodyType == null || bodyType.isUnit()) && body.whenAsResult()
val needReturn = returnsValue && val needReturn = returnsValue &&
(bodyType == null || (!KotlinBuiltIns.isUnit(bodyType) && !KotlinBuiltIns.isNothing(bodyType))) (bodyType == null || (!bodyType.isUnit() && !bodyType.isNothing()))
val factory = KtPsiFactory(declaration) val factory = KtPsiFactory(declaration)
val statement = if (needReturn || unitWhenAsResult) factory.createExpressionByPattern("return $0", body) else body val statement = if (needReturn || unitWhenAsResult) factory.createExpressionByPattern("return $0", body) else body
@@ -77,10 +77,10 @@ class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody
val newBody = when (declaration) { val newBody = when (declaration) {
is KtNamedFunction -> { is KtNamedFunction -> {
val returnType = declaration.returnType()!! val returnType = declaration.returnType()!!
if (!declaration.hasDeclaredReturnType() && !KotlinBuiltIns.isUnit(returnType)) { if (!declaration.hasDeclaredReturnType() && !returnType.isUnit()) {
declaration.setType(returnType) declaration.setType(returnType)
} }
generateBody(!KotlinBuiltIns.isUnit(returnType) && !KotlinBuiltIns.isNothing(returnType)) generateBody(!returnType.isUnit() && !returnType.isNothing())
} }
is KtPropertyAccessor -> generateBody(declaration.isGetter) is KtPropertyAccessor -> generateBody(declaration.isGetter)