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

KotlinImportOptimizer: replace LinkedHashMap with HashMap and BodyResolveMode.FULL with BodyResolveMode.PARTIAL

Browse Source
This commit is contained in:
Dmitry Gridin
2020-06-16 22:41:55 +07:00
parent 383fa2d111
commit 8faced9192
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/imports/OptimizedImportsBuilder.kt
+2 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.renderer.render
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.BindingTraceContext
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.lazy.FileScopeProvider import org.jetbrains.kotlin.resolve.lazy.FileScopeProvider
import org.jetbrains.kotlin.resolve.scopes.ImportingScope import org.jetbrains.kotlin.resolve.scopes.ImportingScope
import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
@@ -177,7 +178,7 @@ class OptimizedImportsBuilder(
ProgressManager.checkCanceled() ProgressManager.checkCanceled()
val element = ref.element val element = ref.element
val bindingContext = element.analyze() val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
val expressionToAnalyze = getExpressionToAnalyze(element) ?: continue val expressionToAnalyze = getExpressionToAnalyze(element) ?: continue
val newScope = element.getResolutionScope( val newScope = element.getResolutionScope(
bindingContext, bindingContext,
idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+10 -5
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope
import org.jetbrains.kotlin.resolve.scopes.utils.* import org.jetbrains.kotlin.resolve.scopes.utils.*
@@ -116,12 +117,16 @@ class KotlinImportOptimizer : ImportOptimizer {
.mapNotNull { it.importPath } .mapNotNull { it.importPath }
.groupBy(keySelector = { it.fqName }, valueTransform = { it.importedName as Name }) .groupBy(keySelector = { it.fqName }, valueTransform = { it.importedName as Name })
private val descriptorsToImport = LinkedHashSet<DeclarationDescriptor>() private val descriptorsToImport = hashSetOf<DeclarationDescriptor>()
private val namesToImport = LinkedHashMap<FqName, HashSet<Name>>() private val namesToImport = hashMapOf<FqName, MutableSet<Name>>()
private val abstractRefs = ArrayList<OptimizedImportsBuilder.AbstractReference>() private val abstractRefs = ArrayList<OptimizedImportsBuilder.AbstractReference>()
val data: OptimizedImportsBuilder.InputData val data: OptimizedImportsBuilder.InputData
get() = OptimizedImportsBuilder.InputData(descriptorsToImport, namesToImport, abstractRefs) get() = OptimizedImportsBuilder.InputData(
descriptorsToImport,
namesToImport,
abstractRefs,
)
override fun visitElement(element: PsiElement) { override fun visitElement(element: PsiElement) {
ProgressIndicatorProvider.checkCanceled() ProgressIndicatorProvider.checkCanceled()
@@ -144,7 +149,7 @@ class KotlinImportOptimizer : ImportOptimizer {
val names = reference.resolvesByNames val names = reference.resolvesByNames
val bindingContext = element.analyze() val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
val targets = reference.targets(bindingContext) val targets = reference.targets(bindingContext)
for (target in targets) { for (target in targets) {
val importableDescriptor = target.getImportableDescriptor() val importableDescriptor = target.getImportableDescriptor()
@@ -160,7 +165,7 @@ class KotlinImportOptimizer : ImportOptimizer {
if (isAccessibleAsMember(importableDescriptor, element, bindingContext)) continue if (isAccessibleAsMember(importableDescriptor, element, bindingContext)) continue
val descriptorNames = (aliases[importableFqName].orEmpty() + importableFqName.shortName()).intersect(names) val descriptorNames = (aliases[importableFqName].orEmpty() + importableFqName.shortName()).intersect(names)
namesToImport.getOrPut(importableFqName) { LinkedHashSet() } += descriptorNames namesToImport.getOrPut(importableFqName) { hashSetOf() } += descriptorNames
descriptorsToImport += importableDescriptor descriptorsToImport += importableDescriptor
} }
} }