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

Optimize contributedDescriptors

Browse Source 
Take kindFilters into account on early stage.

#KTIJ-23032
This commit is contained in:
Vladimir Dolzhenko
2022-09-26 16:32:16 +02:00
committed by teamcity
parent c198d4d90d
commit a32c660a67
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyExplicitImportScope.kt
+9 -3
View File
@@ -67,9 +67,15 @@ class LazyExplicitImportScope(
): Collection<DeclarationDescriptor> { ): Collection<DeclarationDescriptor> {
val descriptors = SmartList<DeclarationDescriptor>() val descriptors = SmartList<DeclarationDescriptor>()
descriptors.addIfNotNull(getContributedClassifier(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS)) if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
descriptors.addAll(getContributedFunctions(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS)) descriptors.addIfNotNull(getContributedClassifier(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS))
descriptors.addAll(getContributedVariables(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS)) }
if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
descriptors.addAll(getContributedFunctions(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS))
}
if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
descriptors.addAll(getContributedVariables(aliasName, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS))
}
if (changeNamesForAliased && aliasName != declaredName) { if (changeNamesForAliased && aliasName != declaredName) {
for (i in descriptors.indices) { for (i in descriptors.indices) {