New J2K: Rearrange conversions

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()

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 <T> List<T>.replace(element: T, replacer: T): List<T> {
-        val mutableList = toMutableList()
-        val index = indexOf(element)
-        mutableList[index] = replacer
-        return mutableList
-    }
-
     private fun processClass(element: JKClass) {
         val constructors = element.declarationList.filterIsInstance<JKKtConstructor>()
         if (constructors.any { it is JKKtPrimaryConstructor }) return