azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinImportOptimizer: should use with isIndeterminate=false

Browse Source 
#KT-34928 Fixed
This commit is contained in:
Dmitry Gridin
2019-12-02 19:34:53 +07:00
parent 7c9826b60b
commit cdabff1941
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+17 -18
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.imports
import com.intellij.lang.ImportOptimizer import com.intellij.lang.ImportOptimizer
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.openapi.progress.ProgressIndicatorProvider
import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
@@ -75,9 +76,7 @@ class KotlinImportOptimizer : ImportOptimizer {
//TODO: keep existing imports? at least aliases (comments) //TODO: keep existing imports? at least aliases (comments)
ProgressIndicatorProvider.getInstance().progressIndicator?.text = "Collect unused imports for ${file.name}" val descriptorsToImport = collectDescriptorsToImport(file, true)
val descriptorsToImport = collectDescriptorsToImport(file)
val imports = prepareOptimizedImports(file, descriptorsToImport) ?: return null val imports = prepareOptimizedImports(file, descriptorsToImport) ?: return null
val intersect = imports.intersect(oldImports.map { it.importPath }) 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 data class OptimizeInformation(val add: Int, val remove: Int, val imports: List<ImportPath>)
private class CollectUsedDescriptorsVisitor(file: KtFile) : KtVisitorVoid() { private class CollectUsedDescriptorsVisitor(file: KtFile, val progressIndicator: ProgressIndicator? = null) : KtVisitorVoid() {
private val elementsSize: Int private val elementsSize: Int = if (progressIndicator != null) {
init {
var size = 0 var size = 0
file.accept(object : KtVisitorVoid() { file.accept(object : KtVisitorVoid() {
override fun visitElement(element: PsiElement) { override fun visitElement(element: PsiElement) {
@@ -101,7 +98,9 @@ class KotlinImportOptimizer : ImportOptimizer {
element.acceptChildren(this) element.acceptChildren(this)
} }
}) })
elementsSize = size size
} else {
0
} }
private var elementProgress: Int = 0 private var elementProgress: Int = 0
@@ -122,7 +121,7 @@ class KotlinImportOptimizer : ImportOptimizer {
override fun visitElement(element: PsiElement) { override fun visitElement(element: PsiElement) {
ProgressIndicatorProvider.checkCanceled() ProgressIndicatorProvider.checkCanceled()
elementProgress += 1 elementProgress += 1
ProgressIndicatorProvider.getInstance().progressIndicator?.fraction = elementProgress / elementsSize.toDouble() progressIndicator?.fraction = elementProgress / elementsSize.toDouble()
element.acceptChildren(this) element.acceptChildren(this)
} }
@@ -189,13 +188,9 @@ class KotlinImportOptimizer : ImportOptimizer {
val noImportsScope = resolutionScope.replaceImportingScopes(null) val noImportsScope = resolutionScope.replaceImportingScopes(null)
if (isInScope(noImportsScope)) return true if (isInScope(noImportsScope)) return true
if (target !is ClassDescriptor) { // classes not accessible through receivers, only their constructors // classes not accessible through receivers, only their constructors
if (resolutionScope.getImplicitReceiversHierarchy().any { return if (target is ClassDescriptor) false
isInScope(it.type.memberScope.memberScopeAsImportingScope()) else resolutionScope.getImplicitReceiversHierarchy().any { isInScope(it.type.memberScope.memberScopeAsImportingScope()) }
}
) return true
}
return false
} }
private class AbstractReferenceImpl(private val reference: KtReference) : OptimizedImportsBuilder.AbstractReference { private class AbstractReferenceImpl(private val reference: KtReference) : OptimizedImportsBuilder.AbstractReference {
@@ -222,8 +217,12 @@ class KotlinImportOptimizer : ImportOptimizer {
} }
companion object { companion object {
fun collectDescriptorsToImport(file: KtFile): OptimizedImportsBuilder.InputData { fun collectDescriptorsToImport(file: KtFile, inProgressBar: Boolean = false): OptimizedImportsBuilder.InputData {
val visitor = CollectUsedDescriptorsVisitor(file) 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) file.accept(visitor)
return visitor.data return visitor.data
} }