From aaf05d5eb23c3380714d98817bbd1d4fbeaf6476 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Fri, 27 Sep 2019 22:50:25 +0300
Subject: [PATCH] New J2K: reduce count of post-processing groups

---
 .../nj2k/postProcessing/J2kPostProcessor.kt   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

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<NamedPostProcessingGroup> = listOf(
     NamedPostProcessingGroup(
-        "Inferring declarations nullability",
+        "Inferring types",
         listOf(
             InspectionLikeProcessingGroup(
                 processings = listOf(
@@ -239,14 +239,13 @@ private val processings: List<NamedPostProcessingGroup> = 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<NamedPostProcessingGroup> = listOf(
                 RemoveExplicitGetterInspectionBasedProcessing(),
                 RemoveExplicitSetterInspectionBasedProcessing()
             ),
-            ConvertToDataClassProcessing()
-        )
-    ),
-    NamedPostProcessingGroup(
-        "Cleaning up Kotlin code",
-        listOf(
+            ConvertToDataClassProcessing(),
             errorsFixingDiagnosticBasedPostProcessingGroup,
             addOrRemoveModifiersProcessingGroup,
             inspectionLikePostProcessingGroup,
@@ -273,11 +267,8 @@ private val processings: List<NamedPostProcessingGroup> = listOf(
         "Optimizing imports",
         listOf(
             OptimizeImportsProcessing(),
-            ShortenReferenceProcessing()
+            ShortenReferenceProcessing(),
+            FormatCodeProcessing()
         )
-    ),
-    NamedPostProcessingGroup(
-        "Formatting code",
-        listOf(FormatCodeProcessing())
     )
 )
\ No newline at end of file