From b9f8ff907996b7f548cbd9bc7e225377c93b2e17 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 13 Feb 2019 16:08:39 +0300
Subject: [PATCH] New J2K: Rearrange conversions

---
 nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt   | 4 ++--
 .../conversions/PrimaryConstructorDetectConversion.kt     | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

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