From 9e487a63269112aee8cc3e5b934e34eec88dc20f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 24 May 2016 14:31:51 +0300
Subject: [PATCH] Minor refactoring: convert to block body

---
 .../idea/intentions/ConvertToBlockBodyIntention.kt   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
index eb0330898bc..972fba73a1b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
@@ -19,12 +19,13 @@ package org.jetbrains.kotlin.idea.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.typeUtil.isNothing
+import org.jetbrains.kotlin.types.typeUtil.isUnit
 
 class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody>(
         KtDeclarationWithBody::class.java, "Convert to block body"
@@ -62,12 +63,11 @@ class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody
         fun convert(declaration: KtDeclarationWithBody): KtDeclarationWithBody {
             val body = declaration.bodyExpression!!
 
-
             fun generateBody(returnsValue: Boolean): KtExpression {
                 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 &&
-                                 (bodyType == null || (!KotlinBuiltIns.isUnit(bodyType) && !KotlinBuiltIns.isNothing(bodyType)))
+                                 (bodyType == null || (!bodyType.isUnit() && !bodyType.isNothing()))
 
                 val factory = KtPsiFactory(declaration)
                 val statement = if (needReturn || unitWhenAsResult) factory.createExpressionByPattern("return $0", body) else body
@@ -77,10 +77,10 @@ class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody
             val newBody = when (declaration) {
                 is KtNamedFunction -> {
                     val returnType = declaration.returnType()!!
-                    if (!declaration.hasDeclaredReturnType() && !KotlinBuiltIns.isUnit(returnType)) {
+                    if (!declaration.hasDeclaredReturnType() && !returnType.isUnit()) {
                         declaration.setType(returnType)
                     }
-                    generateBody(!KotlinBuiltIns.isUnit(returnType) && !KotlinBuiltIns.isNothing(returnType))
+                    generateBody(!returnType.isUnit() && !returnType.isNothing())
                 }
 
                 is KtPropertyAccessor -> generateBody(declaration.isGetter)