From 2a53043fefefa359c00814501d9bae7b011567e4 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 29 Jun 2017 18:01:21 +0300
Subject: [PATCH] Generate equals/hashCode(): Fix function body generation

 #KT-18596 Fixed
---
 .../generate/KotlinGenerateEqualsAndHashcodeAction.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
index f34d011b076..b714282bba8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
@@ -180,7 +180,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
             else {
                 generateClassLiteralsNotEqual(paramName, targetClass)
             }
-            val bodyText = StringBuilder().apply {
+            val bodyText = buildString {
                 append("if (this === $paramName) return true\n")
                 append("if ($isNotInstanceCondition) return false\n")
 
@@ -213,7 +213,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
                 append("return true")
             }
 
-            equalsFun.bodyExpression!!.replace(KtPsiFactory(project).createExpression("{\n$bodyText\n}"))
+            equalsFun.bodyExpression!!.replace(KtPsiFactory(project).createBlock(bodyText))
 
             return equalsFun
         }
@@ -269,7 +269,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
                 }.toString()
             } else "return $initialValue"
 
-            hashCodeFun.bodyExpression!!.replace(KtPsiFactory(project).createExpression("{\n$bodyText\n}"))
+            hashCodeFun.bodyExpression!!.replace(KtPsiFactory(project).createBlock(bodyText))
 
             return hashCodeFun
         }