From 44185c12462798f1f37d2112f8730bac4575cc3e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 8 Nov 2018 16:28:03 +0300 Subject: [PATCH] New J2K: Fix adding init section with empty body --- .../FieldInitializersInPrimaryFromParamsConversion.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldInitializersInPrimaryFromParamsConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldInitializersInPrimaryFromParamsConversion.kt index 51e177d7245..1da6ebdb46a 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldInitializersInPrimaryFromParamsConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/FieldInitializersInPrimaryFromParamsConversion.kt @@ -15,7 +15,9 @@ class FieldInitializersInPrimaryFromParamsConversion(private val context: Conver if (element !is JKClass) return recurse(element) val primaryConstructorConversion = PrimaryConstructorConversion() primaryConstructorConversion.runConversion(element, context) - element.getOrCreateInitDeclaration().block = JKBlockImpl(primaryConstructorConversion.initDeclarationStatements) + if (primaryConstructorConversion.initDeclarationStatements.isNotEmpty()) { + element.getOrCreateInitDeclaration().block = JKBlockImpl(primaryConstructorConversion.initDeclarationStatements) + } element.declarationList -= primaryConstructorConversion.declarationsToRemove return recurse(element) }