From b6239a91303eda2c3553fecc2d22dbb08ad1a534 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 9 Oct 2018 14:22:21 +0300 Subject: [PATCH] New J2K: Fix InsertDefaultPrimaryConstructorConversion acceptability determining --- .../conversions/InsertDefaultPrimaryConstructorConversion.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt index b5b72089e32..a371ebf5b55 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/InsertDefaultPrimaryConstructorConversion.kt @@ -10,10 +10,11 @@ import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.JKModalityModifier.Modality.* import org.jetbrains.kotlin.j2k.tree.impl.* + class InsertDefaultPrimaryConstructorConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() { override fun applyToElement(element: JKTreeElement): JKTreeElement { if (element !is JKClass) return recurse(element) - if (element.classKind != JKClass.ClassKind.CLASS && element.declarationList.none { it is JKKtConstructor }) return recurse(element) + if (element.classKind != JKClass.ClassKind.CLASS && element.declarationList.any { it is JKKtConstructor }) return recurse(element) val constructor = JKKtPrimaryConstructorImpl( JKNameIdentifierImpl(element.name.value), emptyList(), JKBodyStub,