From 0674e6462cefe5cac559aca1b569c56cba0af0eb Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 17 Jan 2019 15:00:18 +0300
Subject: [PATCH] New J2K: Fix conversions order

---
 j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
index a27ae94ff0b..b8cbfafb2d1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
@@ -26,7 +26,6 @@ object ConversionsRunner {
             //Java --> Kotlin conversions
             +JavaModifiersConversion(context)
             +JavaAnnotationsConversion()
-            +InternalClassConversion(context)
             +ModalityConversion(context)
             +AssignmentAsExpressionToAlsoConversion(context)
             +AssignmentStatementValCreationConversion(context)
@@ -56,23 +55,23 @@ object ConversionsRunner {
             +SwitchStatementConversion(context)
             +LiteralConversion()
             +ForConversion(context)
+            +LabeledStatementConversion()
             +ForInConversion()
-            +CollectionOperationsConversion(context)
             +TypeParametersNullabilityConversion()
             +ArrayOperationsConversion(context)
+            +BuiltinMembersConversion(context)
+            +EqualsOperatorConversion(context)
             +TypeMappingConversion(context)
             +ImplicitCastsConversion(context)
             +LowerNullabilityInFunctionParametersConversion(context)
-            +FixNullabilityBySuperFunctionConversion(context)
             +DefaultNullabilityToNullableConversion()
             +NullableQualifierConversion(context)
-            +StringMethodsConversion(context)
+            +InternalClassConversion()
 
             //Kotlin --> Kotlin conversions
             +InnerClassConversion()
             +StaticsToCompanionExtractConversion()
             +ClassToObjectPromotionConversion(context)
-            +LabeledStatementConversion()
             +ImportStatementConversion()
             +SortClassMembersConversion()
         }