New J2K: group post-processings to named groups

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/J2kPostProcessor.kt

@@ -67,13 +67,15 @@ class NewJ2kPostProcessor : PostProcessor {
         onPhaseChanged: ((Int, String) -> Unit)?
     ) {
         runBlocking(EDT.ModalityStateElement(ModalityState.defaultModalityState())) {
-            for ((i, processing) in processings.withIndex()) {
+            for ((i, group) in processings.withIndex()) {
-                onPhaseChanged?.invoke(i, processing.description)
+                onPhaseChanged?.invoke(i + 1, group.description)
+                for (processing in group.processings) {
                     processing.runProcessing(file, rangeMarker, converterContext as NewJ2kConverterContext)
                     commitFile(file)
                 }
             }
         }
+    }
 
     private suspend fun commitFile(file: KtFile) {
         withContext(EDT) {
@@ -86,24 +88,36 @@ class NewJ2kPostProcessor : PostProcessor {
     }
 }
 
-private val processings: List<GeneralPostProcessing> = listOf(
+private val processings: List<NamedPostProcessingGroup> = listOf(
-    nullabilityProcessing,
+    NamedPostProcessingGroup(
-    formatCodeProcessing,
+        "Inferring declarations nullability",
-    shortenReferencesProcessing,
+        listOf(nullabilityProcessing)
-    InspectionLikeProcessingGroup(ConvertGettersAndSettersToPropertyProcessing.DESCRIPTION, VarToValProcessing()),
-    ConvertGettersAndSettersToPropertyProcessing(),
-    InspectionLikeProcessingGroup(
-        ConvertGettersAndSettersToPropertyProcessing.DESCRIPTION,
-        MoveGetterAndSetterAnnotationsToPropertyProcessing()
     ),
+    NamedPostProcessingGroup(
+        "Formatting code",
+        listOf(formatCodeProcessing)
+    ),
+    NamedPostProcessingGroup(
+        "Shortening fully-qualified references",
+        listOf(shortenReferencesProcessing)
+    ),
+    NamedPostProcessingGroup(
+        "Converting POJOs to data classes",
+        listOf(
+            InspectionLikeProcessingGroup(VarToValProcessing()),
+            ConvertGettersAndSettersToPropertyProcessing(),
+            InspectionLikeProcessingGroup(MoveGetterAndSetterAnnotationsToPropertyProcessing()),
             InspectionLikeProcessingGroup(
-        ConvertGettersAndSettersToPropertyProcessing.DESCRIPTION,
                 generalInspectionBasedProcessing(RedundantGetterInspection()),
                 generalInspectionBasedProcessing(RedundantSetterInspection())
             ),
-    ConvertToDataClassProcessing(),
+            ConvertToDataClassProcessing()
-    InspectionLikeProcessingGroup(
+        )
+    ),
+    NamedPostProcessingGroup(
         "Cleaning up Kotlin code",
+        listOf(
+            InspectionLikeProcessingGroup(
                 RemoveRedundantVisibilityModifierProcessing(),
                 RemoveRedundantModalityModifierProcessing(),
                 RemoveRedundantConstructorKeywordProcessing(),
@@ -277,8 +291,18 @@ private val processings: List<GeneralPostProcessing> = listOf(
                     }
                 },
                 RemoveForExpressionLoopParameterTypeProcessing()
+            )
+        )
     ),
-    formatCodeProcessing,
+    NamedPostProcessingGroup(
+        "Optimizing imports",
+        listOf(
             optimizeImportsProcessing,
             shortenReferencesProcessing
+        )
+    ),
+    NamedPostProcessingGroup(
+        "Formatting code",
+        listOf(formatCodeProcessing)
+    )
 )

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/inspectionLikePostProcessings.kt

@@ -41,13 +41,9 @@ import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
 
-class InspectionLikeProcessingGroup(
+class InspectionLikeProcessingGroup(val inspectionLikeProcessings: List<InspectionLikeProcessing>) : ProcessingGroup {
-    override val description: String,
-    val inspectionLikeProcessings: List<InspectionLikeProcessing>
-) : ProcessingGroup {
 
-    constructor(description: String, vararg inspectionLikeProcessings: InspectionLikeProcessing) :
+    constructor(vararg inspectionLikeProcessings: InspectionLikeProcessing) : this(inspectionLikeProcessings.toList())
-            this(description, inspectionLikeProcessings.toList())
 
     private val processingsToPriorityMap = inspectionLikeProcessings.mapToIndex()
     fun priority(processing: InspectionLikeProcessing): Int = processingsToPriorityMap.getValue(processing)

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/postProcessings.kt

@@ -18,11 +18,10 @@ import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
 
 
 interface GeneralPostProcessing {
-    val description: String
     suspend fun runProcessing(file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext)
 }
 
-abstract class SimplePostProcessing(override val description: String) : GeneralPostProcessing {
+abstract class SimplePostProcessing() : GeneralPostProcessing {
     final override suspend fun runProcessing(file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) {
         withContext(EDT) {
             CommandProcessor.getInstance().runUndoTransparentAction {
@@ -36,7 +35,7 @@ abstract class SimplePostProcessing(override val description: String) : GeneralP
     abstract fun applySimpleProcessing(file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext)
 }
 
-abstract class ElementsBasedPostProcessing(description: String) : SimplePostProcessing(description) {
+abstract class ElementsBasedPostProcessing() : SimplePostProcessing() {
     final override fun applySimpleProcessing(file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) {
         val elements =
             rangeMarker?.let { marker ->
@@ -50,12 +49,17 @@ abstract class ElementsBasedPostProcessing(description: String) : SimplePostProc
 
 interface ProcessingGroup : GeneralPostProcessing
 
+data class NamedPostProcessingGroup(
+    val description: String,
+    val processings: List<GeneralPostProcessing>
+)
+
 fun postProcessing(
-    description: String,
     action: (file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) -> Unit
 ): GeneralPostProcessing =
-    object : SimplePostProcessing(description) {
+    object : SimplePostProcessing() {
         override fun applySimpleProcessing(file: KtFile, rangeMarker: RangeMarker?, converterContext: NewJ2kConverterContext) {
             action(file, rangeMarker, converterContext)
         }
     }
+

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertGettersAndSettersToPropertyProcessing.kt

@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.kotlin.utils.mapToIndex
 
-class ConvertGettersAndSettersToPropertyProcessing : ElementsBasedPostProcessing(DESCRIPTION) {
+class ConvertGettersAndSettersToPropertyProcessing : ElementsBasedPostProcessing() {
     private fun KtNamedFunction.hasOverrides(): Boolean =
         toLightMethods().singleOrNull()?.let { lightMethod ->
             OverridingMethodsSearch.search(lightMethod).findFirst()
@@ -525,9 +525,6 @@ class ConvertGettersAndSettersToPropertyProcessing : ElementsBasedPostProcessing
             }
         }
     }
-    companion object {
-        const val DESCRIPTION = "Converting POJOs to data classes"
-    }
 }
 
 

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/ConvertToDataClassProcessing.kt

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.psiUtil.containingClass
 import org.jetbrains.kotlin.psi.psiUtil.visibilityModifierTypeOrDefault
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 
-class ConvertToDataClassProcessing : ElementsBasedPostProcessing(ConvertGettersAndSettersToPropertyProcessing.DESCRIPTION) {
+class ConvertToDataClassProcessing : ElementsBasedPostProcessing() {
     private fun KtCallableDeclaration.rename(newName: String) {
         val factory = KtPsiFactory(this)
         val escapedName = newName.escaped()

nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/processings.kt

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.KtPackageDirective
 import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
 
 val formatCodeProcessing =
-    postProcessing("Formating code") { file, rangeMarker, _ ->
+    postProcessing { file, rangeMarker, _ ->
         file.commitAndUnblockDocument()
         val codeStyleManager = CodeStyleManager.getInstance(file.project)
         if (rangeMarker != null) {
@@ -35,7 +35,7 @@ val formatCodeProcessing =
     }
 
 val nullabilityProcessing =
-    postProcessing("Inferring declarations nullability") { file, rangeMarker, converterContext ->
+    postProcessing { file, rangeMarker, converterContext ->
         NullabilityAnalysisFacade(
             converterContext,
             getTypeElementNullability = { nullabilityByUndefinedNullabilityComment(it, converterContext) },
@@ -45,7 +45,7 @@ val nullabilityProcessing =
     }
 
 val shortenReferencesProcessing =
-    postProcessing("Shortening fully-qualified references") { file, rangeMarker, _ ->
+    postProcessing { file, rangeMarker, _ ->
         if (rangeMarker != null) {
             ShortenReferences.DEFAULT.process(file, rangeMarker.startOffset, rangeMarker.endOffset)
         } else {
@@ -54,7 +54,7 @@ val shortenReferencesProcessing =
     }
 
 val optimizeImportsProcessing =
-    postProcessing("Optimizing imports") { file, rangeMarker, _ ->
+    postProcessing { file, rangeMarker, _ ->
         val elements = if (rangeMarker != null) {
             file.elementsInRange(TextRange(rangeMarker.startOffset, rangeMarker.endOffset))
         } else file.children.asList()