From cdabff19417d70f2fbdb56ba6f5541b0ef7164db Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 2 Dec 2019 19:34:53 +0700
Subject: [PATCH] KotlinImportOptimizer: should use with
 `isIndeterminate=false` #KT-34928 Fixed

---
 .../idea/imports/KotlinImportOptimizer.kt     | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index 534c3eee2ad..fa71a89904d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.imports
 
 import com.intellij.lang.ImportOptimizer
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressIndicatorProvider
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiDocumentManager
@@ -75,9 +76,7 @@ class KotlinImportOptimizer : ImportOptimizer {
 
         //TODO: keep existing imports? at least aliases (comments)
 
-        ProgressIndicatorProvider.getInstance().progressIndicator?.text = "Collect unused imports for ${file.name}"
-
-        val descriptorsToImport = collectDescriptorsToImport(file)
+        val descriptorsToImport = collectDescriptorsToImport(file, true)
 
         val imports = prepareOptimizedImports(file, descriptorsToImport) ?: return null
         val intersect = imports.intersect(oldImports.map { it.importPath })
@@ -90,10 +89,8 @@ class KotlinImportOptimizer : ImportOptimizer {
 
     private data class OptimizeInformation(val add: Int, val remove: Int, val imports: List<ImportPath>)
 
-    private class CollectUsedDescriptorsVisitor(file: KtFile) : KtVisitorVoid() {
-        private val elementsSize: Int
-
-        init {
+    private class CollectUsedDescriptorsVisitor(file: KtFile, val progressIndicator: ProgressIndicator? = null) : KtVisitorVoid() {
+        private val elementsSize: Int = if (progressIndicator != null) {
             var size = 0
             file.accept(object : KtVisitorVoid() {
                 override fun visitElement(element: PsiElement) {
@@ -101,7 +98,9 @@ class KotlinImportOptimizer : ImportOptimizer {
                     element.acceptChildren(this)
                 }
             })
-            elementsSize = size
+            size
+        } else {
+            0
         }
 
         private var elementProgress: Int = 0
@@ -122,7 +121,7 @@ class KotlinImportOptimizer : ImportOptimizer {
         override fun visitElement(element: PsiElement) {
             ProgressIndicatorProvider.checkCanceled()
             elementProgress += 1
-            ProgressIndicatorProvider.getInstance().progressIndicator?.fraction = elementProgress / elementsSize.toDouble()
+            progressIndicator?.fraction = elementProgress / elementsSize.toDouble()
 
             element.acceptChildren(this)
         }
@@ -189,13 +188,9 @@ class KotlinImportOptimizer : ImportOptimizer {
             val noImportsScope = resolutionScope.replaceImportingScopes(null)
 
             if (isInScope(noImportsScope)) return true
-            if (target !is ClassDescriptor) { // classes not accessible through receivers, only their constructors
-                if (resolutionScope.getImplicitReceiversHierarchy().any {
-                        isInScope(it.type.memberScope.memberScopeAsImportingScope())
-                    }
-                ) return true
-            }
-            return false
+            // classes not accessible through receivers, only their constructors
+            return if (target is ClassDescriptor) false
+            else resolutionScope.getImplicitReceiversHierarchy().any { isInScope(it.type.memberScope.memberScopeAsImportingScope()) }
         }
 
         private class AbstractReferenceImpl(private val reference: KtReference) : OptimizedImportsBuilder.AbstractReference {
@@ -222,8 +217,12 @@ class KotlinImportOptimizer : ImportOptimizer {
     }
 
     companion object {
-        fun collectDescriptorsToImport(file: KtFile): OptimizedImportsBuilder.InputData {
-            val visitor = CollectUsedDescriptorsVisitor(file)
+        fun collectDescriptorsToImport(file: KtFile, inProgressBar: Boolean = false): OptimizedImportsBuilder.InputData {
+            val progressIndicator = if (inProgressBar) ProgressIndicatorProvider.getInstance().progressIndicator else null
+            progressIndicator?.text = "Collect imports for ${file.name}"
+            progressIndicator?.isIndeterminate = false
+
+            val visitor = CollectUsedDescriptorsVisitor(file, progressIndicator)
             file.accept(visitor)
             return visitor.data
         }