diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt index d0d96746458..9b440b949ee 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt @@ -223,7 +223,7 @@ private val cleaningUpDiagnosticBasedPostProcessingGroup = private val processings: List = listOf( NamedPostProcessingGroup( - "Inferring declarations nullability", + "Inferring types", listOf( InspectionLikeProcessingGroup( processings = listOf( @@ -239,14 +239,13 @@ private val processings: List = listOf( ), NamedPostProcessingGroup( "Formatting code", - listOf(FormatCodeProcessing()) + listOf( + FormatCodeProcessing(), + ShortenReferenceProcessing() + ) ), NamedPostProcessingGroup( - "Shortening fully-qualified references", - listOf(ShortenReferenceProcessing()) - ), - NamedPostProcessingGroup( - "Converting POJOs to data classes", + "Cleaning up code", listOf( InspectionLikeProcessingGroup(VarToValProcessing()), ConvertGettersAndSettersToPropertyProcessing(), @@ -255,12 +254,7 @@ private val processings: List = listOf( RemoveExplicitGetterInspectionBasedProcessing(), RemoveExplicitSetterInspectionBasedProcessing() ), - ConvertToDataClassProcessing() - ) - ), - NamedPostProcessingGroup( - "Cleaning up Kotlin code", - listOf( + ConvertToDataClassProcessing(), errorsFixingDiagnosticBasedPostProcessingGroup, addOrRemoveModifiersProcessingGroup, inspectionLikePostProcessingGroup, @@ -273,11 +267,8 @@ private val processings: List = listOf( "Optimizing imports", listOf( OptimizeImportsProcessing(), - ShortenReferenceProcessing() + ShortenReferenceProcessing(), + FormatCodeProcessing() ) - ), - NamedPostProcessingGroup( - "Formatting code", - listOf(FormatCodeProcessing()) ) ) \ No newline at end of file