New J2K: use proper progress indicator for showing progress

#KT-33854 fixed

nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt

@@ -55,20 +55,20 @@ class NewJavaToKotlinConverter(
         postProcessor: PostProcessor,
         progress: ProgressIndicator
     ): FilesResult {
+        progress.isIndeterminate = false
         val phasesCount = postProcessor.phasesCount + 1
         val withProgressProcessor = NewJ2kWithProgressProcessor(progress, files, phasesCount)
-        val (results, externalCodeProcessing, context) = withProgressProcessor.process {
+        return withProgressProcessor.process {
+            val (results, externalCodeProcessing, context) =
                 ApplicationManager.getApplication().runReadAction(Computable {
                     elementsToKotlin(files, withProgressProcessor)
                 })
-        }
 
             val texts = results.mapIndexed { i, result ->
                 try {
                     val kotlinFile = ApplicationManager.getApplication().runReadAction(Computable {
                         KtPsiFactory(project).createFileWithLightClassSupport("dummy.kt", result!!.text, files[i])
                     })
-
                     runBlocking(EDT.ModalityStateElement(ModalityState.defaultModalityState())) {
                         withContext(EDT) {
                             CommandProcessor.getInstance().runUndoTransparentAction {
@@ -78,15 +78,14 @@ class NewJavaToKotlinConverter(
                             }
                         }
                     }
-                withProgressProcessor.process {
                     AfterConversionPass(project, postProcessor).run(
                         kotlinFile,
                         context,
                         range = null,
                         onPhaseChanged = { phase, description ->
                             withProgressProcessor.updateState(i, phase + 1, description)
-                        })
                         }
+                    )
                     kotlinFile.text
                 } catch (e: ProcessCanceledException) {
                     throw e
@@ -95,14 +94,11 @@ class NewJavaToKotlinConverter(
                     result!!.text
                 }
             }
-
+            FilesResult(texts, externalCodeProcessing)
-        return FilesResult(texts, externalCodeProcessing)
+        }
     }
 
     override fun elementsToKotlin(inputElements: List<PsiElement>, processor: WithProgressProcessor): Result {
-        @Suppress("NAME_SHADOWING")
-        val processor = processor as NewJ2kWithProgressProcessor
-
         val phaseDescription = "Converting Java code to Kotlin code"
         val module = targetModule ?: error("Module should not be null for new J2K")
         val contextElement = inputElements.firstOrNull() ?: return Result(emptyList(), null, null)
@@ -112,12 +108,10 @@ class NewJavaToKotlinConverter(
         symbolProvider.preBuildTree(inputElements)
         val importStorage = ImportStorage()
         val treeBuilder = JavaToJKTreeBuilder(symbolProvider, typeFactory, converterServices, importStorage)
-        val asts = processor.process {
+        val asts = inputElements.mapIndexed { i, element ->
-            inputElements.mapIndexed { i, element ->
             processor.updateState(i, 1, phaseDescription)
             element to treeBuilder.buildTree(element)
         }
-        }
 
         val context = NewJ2kConverterContext(
             symbolProvider,
@@ -127,14 +121,12 @@ class NewJavaToKotlinConverter(
             importStorage,
             JKElementInfoStorage()
         )
-        processor.process {
         ConversionsRunner.doApply(asts.withIndex().mapNotNull { (i, ast) ->
             processor.updateState(i, 1, phaseDescription)
             ast.second
         }, context)
-        }
+
-        val results = processor.process {
+        val results = asts.mapIndexed { i, elementWithAst ->
-            asts.mapIndexed { i, elementWithAst ->
             processor.updateState(i, 1, phaseDescription)
             val (element, ast) = elementWithAst
             if (ast == null) return@mapIndexed null
@@ -149,7 +141,6 @@ class NewJavaToKotlinConverter(
                 parseContext = parseContext
             )
         }
-        }
 
         return Result(results, null, context)
     }
@@ -186,9 +177,8 @@ class NewJ2kWithProgressProcessor(
     }
 
     override fun <T> process(action: () -> T): T {
-        // we use special process with EmptyProgressIndicator to avoid changing text in our progress by inheritors search inside etc
         var result: T? = null
-        ProgressManager.getInstance().runProcess({ result = action() }, EmptyProgressIndicator())
+        ProgressManager.getInstance().runProcess({ result = action() }, progress)
         return result!!
     }