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

Generate equals/hashCode(): Fix function body generation

Browse Source 
#KT-18596 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-29 18:01:21 +03:00
parent 33c22b8251
commit 2a53043fef
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/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+3 -3
View File
@@ -180,7 +180,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
else { else {
generateClassLiteralsNotEqual(paramName, targetClass) generateClassLiteralsNotEqual(paramName, targetClass)
} }
val bodyText = StringBuilder().apply { val bodyText = buildString {
append("if (this === $paramName) return true\n") append("if (this === $paramName) return true\n")
append("if ($isNotInstanceCondition) return false\n") append("if ($isNotInstanceCondition) return false\n")
@@ -213,7 +213,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
append("return true") append("return true")
} }
equalsFun.bodyExpression!!.replace(KtPsiFactory(project).createExpression("{\n$bodyText\n}")) equalsFun.bodyExpression!!.replace(KtPsiFactory(project).createBlock(bodyText))
return equalsFun return equalsFun
} }
@@ -269,7 +269,7 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
}.toString() }.toString()
} else "return $initialValue" } else "return $initialValue"
hashCodeFun.bodyExpression!!.replace(KtPsiFactory(project).createExpression("{\n$bodyText\n}")) hashCodeFun.bodyExpression!!.replace(KtPsiFactory(project).createBlock(bodyText))
return hashCodeFun return hashCodeFun
} }