azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: Fix conversions order

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-17 15:00:18 +03:00
committed by Ilya Kirillov
parent 3c5bb0b259
commit 0674e6462c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/ConversionsRunner.kt
+4 -5
View File
@@ -26,7 +26,6 @@ object ConversionsRunner {
//Java --> Kotlin conversions //Java --> Kotlin conversions
+JavaModifiersConversion(context) +JavaModifiersConversion(context)
+JavaAnnotationsConversion() +JavaAnnotationsConversion()
+InternalClassConversion(context)
+ModalityConversion(context) +ModalityConversion(context)
+AssignmentAsExpressionToAlsoConversion(context) +AssignmentAsExpressionToAlsoConversion(context)
+AssignmentStatementValCreationConversion(context) +AssignmentStatementValCreationConversion(context)
@@ -56,23 +55,23 @@ object ConversionsRunner {
+SwitchStatementConversion(context) +SwitchStatementConversion(context)
+LiteralConversion() +LiteralConversion()
+ForConversion(context) +ForConversion(context)
+LabeledStatementConversion()
+ForInConversion() +ForInConversion()
+CollectionOperationsConversion(context)
+TypeParametersNullabilityConversion() +TypeParametersNullabilityConversion()
+ArrayOperationsConversion(context) +ArrayOperationsConversion(context)
+BuiltinMembersConversion(context)
+EqualsOperatorConversion(context)
+TypeMappingConversion(context) +TypeMappingConversion(context)
+ImplicitCastsConversion(context) +ImplicitCastsConversion(context)
+LowerNullabilityInFunctionParametersConversion(context) +LowerNullabilityInFunctionParametersConversion(context)
+FixNullabilityBySuperFunctionConversion(context)
+DefaultNullabilityToNullableConversion() +DefaultNullabilityToNullableConversion()
+NullableQualifierConversion(context) +NullableQualifierConversion(context)
+StringMethodsConversion(context) +InternalClassConversion()
//Kotlin --> Kotlin conversions //Kotlin --> Kotlin conversions
+InnerClassConversion() +InnerClassConversion()
+StaticsToCompanionExtractConversion() +StaticsToCompanionExtractConversion()
+ClassToObjectPromotionConversion(context) +ClassToObjectPromotionConversion(context)
+LabeledStatementConversion()
+ImportStatementConversion() +ImportStatementConversion()
+SortClassMembersConversion() +SortClassMembersConversion()
} }