diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt index e33414cdd89..a4132783f6e 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt @@ -46,6 +46,7 @@ object ConversionsRunner { +EnumFieldAccessConversion(context) +StaticMemberAccessConversion(context) +SynchronizedStatementConversion(context) + +JetbrainsNullableAnnotationsConverter(context) +DefaultArgumentsConversion(context) +ConstructorConversion(context) +StaticInitDeclarationConversion() @@ -53,7 +54,6 @@ object ConversionsRunner { +ParameterModificationInMethodCallsConversion(context) +PrintlnConversion(context) +BlockToRunConversion(context) - +JetbrainsNullableAnnotationsConverter(context) +PrimaryConstructorDetectConversion(context) +InsertDefaultPrimaryConstructorConversion(context) +FieldToPropertyConversion() @@ -71,8 +71,8 @@ object ConversionsRunner { +BuiltinMembersConversion(context) +EqualsOperatorConversion(context) +TypeMappingConversion(context) - +ImplicitCastsConversion(context) +LowerNullabilityInFunctionParametersConversion(context) + +ImplicitCastsConversion(context) +DefaultNullabilityToNullableConversion() +NullableQualifierConversion(context) +InternalClassConversion() diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt index ec2e9c467c4..a36a933a542 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/PrimaryConstructorDetectConversion.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.nj2k.conversions import org.jetbrains.kotlin.nj2k.ConversionContext +import org.jetbrains.kotlin.nj2k.replace import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.tree.impl.JKKtInitDeclarationImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKKtPrimaryConstructorImpl @@ -20,13 +21,6 @@ class PrimaryConstructorDetectConversion(private val context: ConversionContext) return recurse(element) } - private fun List.replace(element: T, replacer: T): List { - val mutableList = toMutableList() - val index = indexOf(element) - mutableList[index] = replacer - return mutableList - } - private fun processClass(element: JKClass) { val constructors = element.declarationList.filterIsInstance() if (constructors.any { it is JKKtPrimaryConstructor }) return