From 0b5de434fa6a065137a0ebc4d2e44fd64908b8ca Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 2 Nov 2015 16:07:19 +0300 Subject: [PATCH] Removed usages KtScope.getAllDescriptors --- .../kotlin/backend/common/CodegenUtil.java | 2 +- .../kotlin/codegen/ClassBodyCodegen.java | 2 +- .../codegen/InterfaceImplBodyCodegen.kt | 2 +- .../kotlin/codegen/JvmCodegenUtil.java | 2 +- .../java/sam/SingleAbstractMethodUtils.java | 4 +++- .../org/jetbrains/kotlin/cfg/WhenChecker.java | 4 ++-- .../kotlin/resolve/DeclarationResolver.kt | 2 +- .../kotlin/resolve/OverrideResolver.java | 10 +++++++--- .../kotlin/resolve/lazy/ForceResolveUtil.java | 3 ++- .../lazy/descriptors/LazyClassDescriptor.java | 5 +++-- .../resolve/scopes/LexicalChainedScope.kt | 2 +- .../serialization/DescriptorSerializer.java | 7 ++++--- .../jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../AbstractSdkAnnotationsValidityTest.java | 2 +- ...ompileKotlinAgainstCustomBinariesTest.java | 3 ++- .../DeserializedScopeValidationVisitor.kt | 2 +- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 3 ++- ...solveDescriptorsFromExternalLibraries.java | 3 ++- ...stractAnnotationDescriptorResolveTest.java | 3 ++- .../kotlin/test/util/DescriptorValidator.java | 3 ++- .../util/RecursiveDescriptorComparator.java | 4 ++-- .../util/RecursiveDescriptorProcessor.java | 7 ++++--- .../builtins/functions/FunctionClassScope.kt | 2 +- .../kotlin/resolve/DescriptorUtils.java | 7 +++++++ .../kotlin/resolve/scopes/KtScope.kt | 19 ++++++++++--------- .../DeserializedClassDescriptor.kt | 4 ++-- .../descriptors/DeserializedMemberScope.kt | 2 +- .../kotlin/reflect/jvm/internal/KClassImpl.kt | 2 +- .../jvm/internal/KDeclarationContainerImpl.kt | 2 +- .../references/BuiltInsReferenceResolver.kt | 2 +- .../idea/completion/smart/StaticMembers.kt | 6 +++--- .../OverrideMembersHandler.kt | 2 +- .../textBuilder/TextConsistencyBaseTest.kt | 2 +- .../BuiltInsReferenceResolverTest.java | 5 +++-- .../translate/declaration/ClassTranslator.kt | 2 +- .../general/JetTestFunctionDetector.java | 3 ++- .../AndroidExpressionCodegenExtension.kt | 2 +- 37 files changed, 82 insertions(+), 57 deletions(-) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java index c3f3f16c3a8..f47317365dd 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java @@ -95,7 +95,7 @@ public class CodegenUtil { @NotNull public static Map getTraitMethods(ClassDescriptor descriptor) { Map result = new LinkedHashMap(); - for (DeclarationDescriptor declaration : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor declaration : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) { if (!(declaration instanceof CallableMemberDescriptor)) continue; CallableMemberDescriptor inheritedMember = (CallableMemberDescriptor) declaration; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index b3e69edd2f6..d2e461b2621 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -67,7 +67,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { } if (!DescriptorUtils.isInterface(descriptor)) { - for (DeclarationDescriptor memberDescriptor : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor memberDescriptor : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) { if (memberDescriptor instanceof CallableMemberDescriptor) { CallableMemberDescriptor member = (CallableMemberDescriptor) memberDescriptor; if (!member.getKind().isReal() && ImplKt.findTraitImplementation(member) == null) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt index 888ef297374..f170d52f44b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt @@ -74,7 +74,7 @@ public class InterfaceImplBodyCodegen( } override fun generateSyntheticParts() { - for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getDescriptors()) { if (memberDescriptor !is CallableMemberDescriptor) continue if (memberDescriptor.getKind().isReal()) continue diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 1613a34f69a..0118fedbe42 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -119,7 +119,7 @@ public class JvmCodegenUtil { } public static boolean hasAbstractMembers(@NotNull ClassDescriptor classDescriptor) { - return CollectionsKt.any(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(), + return CollectionsKt.any(DescriptorUtils.getAllDescriptors(classDescriptor.getDefaultType().getMemberScope()), new Function1() { @Override public Boolean invoke(DeclarationDescriptor descriptor) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java index 23fe3e122f8..61b2844df7a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java @@ -32,6 +32,8 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.types.*; import java.util.*; @@ -45,7 +47,7 @@ public class SingleAbstractMethodUtils { @NotNull public static List getAbstractMembers(@NotNull KotlinType type) { List abstractMembers = new ArrayList(); - for (DeclarationDescriptor member : type.getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor member : type.getMemberScope().getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.Companion.getALL_NAME_FILTER())) { if (member instanceof CallableMemberDescriptor && ((CallableMemberDescriptor) member).getModality() == Modality.ABSTRACT) { abstractMembers.add((CallableMemberDescriptor) member); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index 928505fb78c..3e0bccac64c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -93,7 +93,7 @@ public final class WhenChecker { assert isEnumClass(enumClassDescriptor) : "isWhenOnEnumExhaustive should be called with an enum class descriptor"; Set entryDescriptors = new HashSet(); - for (DeclarationDescriptor descriptor : enumClassDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors()) { + for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(enumClassDescriptor.getUnsubstitutedInnerClassesScope())) { if (isEnumEntry(descriptor)) { entryDescriptors.add((ClassDescriptor) descriptor); } @@ -106,7 +106,7 @@ public final class WhenChecker { @NotNull ClassDescriptor currentDescriptor, @NotNull Set subclasses ) { - for (DeclarationDescriptor descriptor : currentDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors()) { + for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(currentDescriptor.getUnsubstitutedInnerClassesScope())) { if (descriptor instanceof ClassDescriptor) { ClassDescriptor memberClassDescriptor = (ClassDescriptor) descriptor; if (DescriptorUtils.isDirectSubclass(memberClassDescriptor, baseDescriptor)) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt index 84fb2cb9d8e..7c6e975212c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.kt @@ -53,7 +53,7 @@ public class DeclarationResolver( public fun checkRedeclarations(c: TopDownAnalysisContext) { for (classDescriptor in c.getDeclaredClasses().values()) { val descriptorMap = HashMultimap.create() - for (desc in classDescriptor.getUnsubstitutedMemberScope().getOwnDeclaredDescriptors()) { + for (desc in classDescriptor.getUnsubstitutedMemberScope().getDescriptors()) { if (desc is ClassDescriptor || desc is PropertyDescriptor) { descriptorMap.put(desc.getName(), desc) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index f5111b19428..684680a5bf9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java @@ -38,6 +38,8 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; @@ -243,7 +245,7 @@ public class OverrideResolver { private static List getCallableMembersFromType(KotlinType type) { List r = Lists.newArrayList(); - for (DeclarationDescriptor decl : type.getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor decl : type.getMemberScope().getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.Companion.getALL_NAME_FILTER())) { if (decl instanceof PropertyDescriptor || decl instanceof SimpleFunctionDescriptor) { r.add((CallableMemberDescriptor) decl); } @@ -305,7 +307,8 @@ public class OverrideResolver { @NotNull Set abstractInBaseClassNoImpl, @NotNull Set conflictingInterfaceOverrides ) { - for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope() + .getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.Companion.getALL_NAME_FILTER())) { if (member instanceof CallableMemberDescriptor) { collectMissingImplementations((CallableMemberDescriptor) member, abstractNoImpl, manyImpl, @@ -812,7 +815,8 @@ public class OverrideResolver { private void checkParameterOverridesForAllClasses(@NotNull TopDownAnalysisContext c) { for (ClassDescriptorWithResolutionScopes classDescriptor : c.getDeclaredClasses().values()) { - for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope() + .getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.Companion.getALL_NAME_FILTER())) { if (member instanceof CallableMemberDescriptor) { checkOverridesForParameters((CallableMemberDescriptor) member); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java index 554e2fa271e..9831c14a21f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java @@ -22,6 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget; import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.types.*; @@ -38,7 +39,7 @@ public class ForceResolveUtil { } public static void forceResolveAllContents(@NotNull KtScope scope) { - forceResolveAllContents(scope.getAllDescriptors()); + forceResolveAllContents(DescriptorUtils.getAllDescriptors(scope)); } public static void forceResolveAllContents(@NotNull Iterable descriptors) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 70600b7ca10..162029090a0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -46,6 +46,7 @@ import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.kotlin.resolve.lazy.data.JetClassOrObjectInfo; import org.jetbrains.kotlin.resolve.lazy.data.JetObjectInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; @@ -287,7 +288,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes public Collection getDeclaredCallableMembers() { //noinspection unchecked return (Collection) CollectionsKt.filter( - unsubstitutedMemberScope.getAllDescriptors(), + DescriptorUtils.getAllDescriptors(unsubstitutedMemberScope), new Function1() { @Override public Boolean invoke(DeclarationDescriptor descriptor) { @@ -474,7 +475,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes getOriginal(); getScopeForClassHeaderResolution(); getScopeForMemberDeclarationResolution(); - getUnsubstitutedMemberScope().getAllDescriptors(); + getUnsubstitutedMemberScope().getDescriptors(DescriptorKindFilter.ALL, KtScope.Companion.getALL_NAME_FILTER()); getScopeForInitializerResolution(); getUnsubstitutedInnerClassesScope(); getTypeConstructor().getSupertypes(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt index f3d760b1b27..2badb7126b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt @@ -39,7 +39,7 @@ public class LexicalChainedScope @JvmOverloads constructor( private val scopeChain = memberScopes.clone() override fun getContributedDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean) - = getFromAllScopes(scopeChain) { it.getAllDescriptors() } + = getFromAllScopes(scopeChain) { it.getDescriptors() } override fun getContributedClassifier(name: Name, location: LookupLocation) = getFirstMatch(scopeChain) { it.getClassifier(name, location) } diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 1984f3f047f..35c6a00a798 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.MemberComparator; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.NullValue; @@ -156,7 +157,7 @@ public class DescriptorSerializer { builder.addConstructor(constructorProto(descriptor)); } - for (DeclarationDescriptor descriptor : sort(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors())) { + for (DeclarationDescriptor descriptor : sort(DescriptorUtils.getAllDescriptors(classDescriptor.getDefaultType().getMemberScope()))) { if (descriptor instanceof CallableMemberDescriptor) { CallableMemberDescriptor member = (CallableMemberDescriptor) descriptor; if (member.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) continue; @@ -170,7 +171,7 @@ public class DescriptorSerializer { } } - for (DeclarationDescriptor descriptor : sort(classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors())) { + for (DeclarationDescriptor descriptor : sort(DescriptorUtils.getAllDescriptors(classDescriptor.getUnsubstitutedInnerClassesScope()))) { int name = getSimpleNameIndex(descriptor.getName()); if (isEnumEntry(descriptor)) { builder.addEnumEntry(name); @@ -534,7 +535,7 @@ public class DescriptorSerializer { Collection members = new ArrayList(); for (PackageFragmentDescriptor fragment : fragments) { - members.addAll(fragment.getMemberScope().getAllDescriptors()); + members.addAll(DescriptorUtils.getAllDescriptors(fragment.getMemberScope())); } for (DeclarationDescriptor declaration : sort(members)) { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index cf6671c88a9..9407f8be6db 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -120,7 +120,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { tmpdir, getTestRootDisposable(), TestJdkKind.MOCK_JDK, configurationKind, true ).first; - for (DeclarationDescriptor descriptor : packageFromBinary.getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(packageFromBinary.getMemberScope())) { if (descriptor instanceof ClassDescriptor) { assert descriptor instanceof DeserializedClassDescriptor : DescriptorUtils.getFqName(descriptor) + " is loaded as " + descriptor.getClass(); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 1bf1ebb714c..2ea2661b166 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -156,7 +156,7 @@ public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase } private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull KtScope memberScope) { - for (DeclarationDescriptor member : memberScope.getAllDescriptors()) { + for (DeclarationDescriptor member : DescriptorUtils.getAllDescriptors(memberScope)) { member.acceptVoid(this); } return visitDeclaration(descriptor); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 910d2ae6ace..05e8cee9d58 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.test.*; import org.jetbrains.kotlin.test.util.DescriptorValidator; @@ -107,7 +108,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull private Collection analyzeAndGetAllDescriptors(@NotNull File... extraClassPath) throws IOException { - return analyzeFileToPackageView(extraClassPath).getMemberScope().getAllDescriptors(); + return DescriptorUtils.getAllDescriptors(analyzeFileToPackageView(extraClassPath).getMemberScope()); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt index ebb9d9a7db9..a6356ea4432 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -37,7 +37,7 @@ class DeserializedScopeValidationVisitor : ValidationVisitor() { private fun validateDeserializedScope(scope: KtScope) { val isPackageViewScope = scope.safeGetContainingDeclaration() is PackageViewDescriptor if (scope is DeserializedMemberScope || isPackageViewScope) { - val relevantDescriptors = scope.getAllDescriptors().filter { member -> + val relevantDescriptors = scope.getDescriptors().filter { member -> member is CallableMemberDescriptor && member.getKind().isReal() || (!isPackageViewScope && member is ClassDescriptor) } checkSorted(relevantDescriptors, scope.getContainingDeclaration()) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java index bcc71fe13f9..6155ddcfadb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.scopes.KtScope; @@ -96,7 +97,7 @@ public class ExpectedLoadErrorsUtil { } private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull KtScope memberScope) { - for (DeclarationDescriptor member : memberScope.getAllDescriptors()) { + for (DeclarationDescriptor member : DescriptorUtils.getAllDescriptors(memberScope)) { member.acceptVoid(this); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 834f517718e..22ee6c6e0e0 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -214,7 +215,7 @@ public class ResolveDescriptorsFromExternalLibraries { if (clazz == null) { throw new IllegalStateException("class not found by name " + className + " in " + libDescription); } - clazz.getDefaultType().getMemberScope().getAllDescriptors(); + DescriptorUtils.getAllDescriptors(clazz.getDefaultType().getMemberScope()); } catch (Exception e) { System.err.println("failed to resolve " + className); diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 501161f33bd..cb8fc7c5477 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererModifier; import org.jetbrains.kotlin.renderer.DescriptorRendererOptions; import org.jetbrains.kotlin.renderer.NameShortness; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -188,7 +189,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite KtScope memberScope = packageView.getMemberScope(); Collection properties = memberScope.getProperties(propertyName, NoLookupLocation.FROM_TEST); if (properties.isEmpty()) { - for (DeclarationDescriptor descriptor : memberScope.getAllDescriptors()) { + for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(memberScope)) { if (descriptor instanceof ClassDescriptor) { Collection classProperties = ((ClassDescriptor) descriptor).getMemberScope(Collections.emptyList()) diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java index cf75f4a080e..cc75d43dc97 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.types.KotlinType; import org.junit.Assert; @@ -84,7 +85,7 @@ public class DescriptorValidator { } protected void validateScope(@NotNull KtScope scope, @NotNull DiagnosticCollector collector) { - for (DeclarationDescriptor descriptor : scope.getAllDescriptors()) { + for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(scope)) { if (recursiveFilter.apply(descriptor)) { descriptor.accept(new ScopeValidatorVisitor(collector), scope); } diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index a8d27fce08e..977a5584087 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -129,7 +129,7 @@ public class RecursiveDescriptorComparator { appendSubDescriptors(descriptor, module, klass.getDefaultType().getMemberScope(), klass.getConstructors(), printer); KtScope staticScope = klass.getStaticScope(); - if (!staticScope.getAllDescriptors().isEmpty()) { + if (!DescriptorUtils.getAllDescriptors(staticScope).isEmpty()) { printer.println(); printer.println("// Static members"); appendSubDescriptors(descriptor, module, staticScope, Collections.emptyList(), printer); @@ -196,7 +196,7 @@ public class RecursiveDescriptorComparator { List subDescriptors = Lists.newArrayList(); - subDescriptors.addAll(memberScope.getAllDescriptors()); + subDescriptors.addAll(DescriptorUtils.getAllDescriptors(memberScope)); subDescriptors.addAll(extraSubDescriptors); Collections.sort(subDescriptors, MemberComparator.INSTANCE); diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java index f35ea27479e..aec11576daf 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java @@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Collection; @@ -68,13 +69,13 @@ public class RecursiveDescriptorProcessor { @Override public Boolean visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data) { return applyWorker(descriptor, data) - && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data); + && visitChildren(DescriptorUtils.getAllDescriptors(descriptor.getMemberScope()), data); } @Override public Boolean visitPackageViewDescriptor(PackageViewDescriptor descriptor, D data) { return applyWorker(descriptor, data) - && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data); + && visitChildren(DescriptorUtils.getAllDescriptors(descriptor.getMemberScope()), data); } @Override @@ -105,7 +106,7 @@ public class RecursiveDescriptorProcessor { && visitChildren(descriptor.getThisAsReceiverParameter(), data) && visitChildren(descriptor.getConstructors(), data) && visitChildren(descriptor.getTypeConstructor().getParameters(), data) - && visitChildren(descriptor.getDefaultType().getMemberScope().getAllDescriptors(), data); + && visitChildren(DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope()), data); } @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt index f7a70a41796..47dbc3ecff3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt @@ -59,7 +59,7 @@ class FunctionClassScope( private fun createFakeOverrides(invoke: FunctionDescriptor?): List { val result = ArrayList(3) val allSuperDescriptors = functionClass.getTypeConstructor().getSupertypes() - .flatMap { it.getMemberScope().getAllDescriptors() } + .flatMap { it.getMemberScope().getDescriptors() } .filterIsInstance() for ((name, group) in allSuperDescriptors.groupBy { it.getName() }) { for ((isFunction, descriptors) in group.groupBy { it is FunctionDescriptor }) { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index ef5f9d66e05..b473c65d543 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -31,6 +31,8 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.LazyType; @@ -546,4 +548,9 @@ public class DescriptorUtils { return SourceFile.NO_SOURCE_FILE; } + + @NotNull + public static Collection getAllDescriptors(@NotNull KtScope scope) { + return scope.getDescriptors(DescriptorKindFilter.ALL, KtScope.Companion.getALL_NAME_FILTER()); + } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt index 9d917954074..b2324ce8412 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt @@ -41,6 +41,7 @@ public interface KtScope { * * @return All visible descriptors from current scope. */ + @Deprecated("Removed in progress", ReplaceWith("getDescriptors()")) public fun getAllDescriptors(): Collection = getDescriptors() /** @@ -159,15 +160,15 @@ public class DescriptorKindFilter( public val VALUES_MASK: Int = SINGLETON_CLASSIFIERS_MASK or FUNCTIONS_MASK or VARIABLES_MASK public val CALLABLES_MASK: Int = FUNCTIONS_MASK or VARIABLES_MASK - public val ALL: DescriptorKindFilter = DescriptorKindFilter(ALL_KINDS_MASK) - public val CALLABLES: DescriptorKindFilter = DescriptorKindFilter(CALLABLES_MASK) - public val NON_SINGLETON_CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(NON_SINGLETON_CLASSIFIERS_MASK) - public val SINGLETON_CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(SINGLETON_CLASSIFIERS_MASK) - public val CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(CLASSIFIERS_MASK) - public val PACKAGES: DescriptorKindFilter = DescriptorKindFilter(PACKAGES_MASK) - public val FUNCTIONS: DescriptorKindFilter = DescriptorKindFilter(FUNCTIONS_MASK) - public val VARIABLES: DescriptorKindFilter = DescriptorKindFilter(VARIABLES_MASK) - public val VALUES: DescriptorKindFilter = DescriptorKindFilter(VALUES_MASK) + @JvmField public val ALL: DescriptorKindFilter = DescriptorKindFilter(ALL_KINDS_MASK) + @JvmField public val CALLABLES: DescriptorKindFilter = DescriptorKindFilter(CALLABLES_MASK) + @JvmField public val NON_SINGLETON_CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(NON_SINGLETON_CLASSIFIERS_MASK) + @JvmField public val SINGLETON_CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(SINGLETON_CLASSIFIERS_MASK) + @JvmField public val CLASSIFIERS: DescriptorKindFilter = DescriptorKindFilter(CLASSIFIERS_MASK) + @JvmField public val PACKAGES: DescriptorKindFilter = DescriptorKindFilter(PACKAGES_MASK) + @JvmField public val FUNCTIONS: DescriptorKindFilter = DescriptorKindFilter(FUNCTIONS_MASK) + @JvmField public val VARIABLES: DescriptorKindFilter = DescriptorKindFilter(VARIABLES_MASK) + @JvmField public val VALUES: DescriptorKindFilter = DescriptorKindFilter(VALUES_MASK) private class MaskToName(val mask: Int, val name: String) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index 3537640c0c6..c647435546b 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -229,7 +229,7 @@ public class DeserializedClassDescriptor( override fun addNonDeclaredDescriptors(result: MutableCollection, location: LookupLocation) { for (supertype in classDescriptor.getTypeConstructor().supertypes) { - for (descriptor in supertype.memberScope.getAllDescriptors()) { + for (descriptor in supertype.memberScope.getDescriptors()) { if (descriptor is FunctionDescriptor) { result.addAll(getFunctions(descriptor.name, location)) } @@ -312,7 +312,7 @@ public class DeserializedClassDescriptor( val result = HashSet() for (supertype in getTypeConstructor().getSupertypes()) { - for (descriptor in supertype.getMemberScope().getAllDescriptors()) { + for (descriptor in supertype.getMemberScope().getDescriptors()) { if (descriptor is SimpleFunctionDescriptor || descriptor is PropertyDescriptor) { result.add(descriptor.getName()) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index 54eebcc5447..99b3add7bd1 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -175,7 +175,7 @@ public abstract class DeserializedMemberScope protected constructor( protected abstract fun addEnumEntryDescriptors(result: MutableCollection, nameFilter: (Name) -> Boolean) - override fun getOwnDeclaredDescriptors() = getAllDescriptors() + override fun getOwnDeclaredDescriptors() = getDescriptors() override fun printScopeStructure(p: Printer) { p.println(javaClass.simpleName, " {") diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt index 5d2eb1a8a4d..f3837b16fa3 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -120,7 +120,7 @@ internal class KClassImpl(override val jClass: Class) : KDeclaration } override val nestedClasses: Collection> - get() = descriptor.unsubstitutedInnerClassesScope.getAllDescriptors().map { nestedClass -> + get() = descriptor.unsubstitutedInnerClassesScope.getDescriptors().map { nestedClass -> val source = (nestedClass as DeclarationDescriptorWithSource).source when (source) { is KotlinJvmBinarySourceElement -> diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt index eaa6161bf41..064d8f882bd 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt @@ -78,7 +78,7 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain } } - return scope.getAllDescriptors().asSequence() + return scope.getDescriptors().asSequence() .filter { descriptor -> descriptor !is MemberDescriptor || descriptor.getVisibility() != Visibilities.INVISIBLE_FAKE } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt index 9bd83442393..9fe5a4e088c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt @@ -108,7 +108,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager: containingDeclaration.getConstructors() } else { - memberScope.getAllDescriptors() + memberScope.getDescriptors() } return descriptors.firstOrNull { renderedOriginal == DescriptorRenderer.FQ_NAMES_IN_TYPES.render(it) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt index 004fa43b194..2047ee517d7 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt @@ -90,16 +90,16 @@ class StaticMembers( } } - classDescriptor.getStaticScope().getAllDescriptors().forEach(::processMember) + classDescriptor.getStaticScope().getDescriptors().forEach(::processMember) val companionObject = classDescriptor.getCompanionObjectDescriptor() if (companionObject != null) { - companionObject.getDefaultType().getMemberScope().getAllDescriptors() + companionObject.getDefaultType().getMemberScope().getDescriptors() .filter { !it.isExtension } .forEach(::processMember) } - var members = classDescriptor.getDefaultType().getMemberScope().getAllDescriptors() + var members = classDescriptor.getDefaultType().getMemberScope().getDescriptors() if (classDescriptor.getKind() != ClassKind.ENUM_CLASS) { members = members.filter { DescriptorUtils.isNonCompanionObject(it) } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt index 79b849a6355..c8b91df8359 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt @@ -26,7 +26,7 @@ import java.util.* public class OverrideMembersHandler : OverrideImplementMembersHandler() { override fun collectMembersToGenerate(descriptor: ClassDescriptor, project: Project): Collection { val result = ArrayList() - for (member in descriptor.unsubstitutedMemberScope.getAllDescriptors()) { + for (member in descriptor.unsubstitutedMemberScope.getDescriptors()) { if (member is CallableMemberDescriptor && (member.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE || member.kind == CallableMemberDescriptor.Kind.DELEGATION)) { val overridden = member.overriddenDescriptors diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt index f1755b697ae..25a6c88b632 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt @@ -79,7 +79,7 @@ public abstract class TextConsistencyBaseTest : KotlinLightCodeInsightFixtureTes module.resolveTopLevelClass(classId.asSingleFqName(), NoLookupLocation.FROM_TEST) override fun resolveDeclarationsInFacade(facadeFqName: FqName): Collection = - module.getPackage(facadeFqName.parent()).memberScope.getAllDescriptors().filter { + module.getPackage(facadeFqName.parent()).memberScope.getDescriptors().filter { it is CallableMemberDescriptor && it.module != module.builtIns.builtInsModule && isFromFacade(it, facadeFqName) diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index f7ceeb5df97..f131d8661f8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBo import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.ArrayList; import java.util.Collection; @@ -93,12 +94,12 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase { PackageFragmentDescriptor builtinsPackageFragment = DefaultBuiltIns.getInstance().getBuiltInsPackageFragment(); - for (DeclarationDescriptor packageMember : builtinsPackageFragment.getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor packageMember : DescriptorUtils.getAllDescriptors(builtinsPackageFragment.getMemberScope())) { packageMember.acceptVoid(new DeclarationDescriptorVisitorEmptyBodies() { @Override public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) { descriptors.add(descriptor); - for (DeclarationDescriptor classMember : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (DeclarationDescriptor classMember : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) { classMember.acceptVoid(this); } return null; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt index d3af0a84fa4..611ea1676a6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.kt @@ -240,7 +240,7 @@ public class ClassTranslator private constructor( } private fun generateOtherBridges(properties: MutableList) { - for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { + for (memberDescriptor in descriptor.getDefaultType().getMemberScope().getDescriptors()) { if (memberDescriptor is FunctionDescriptor) { val bridgesToGenerate = generateBridgesForFunctionDescriptor(memberDescriptor, identity()) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java index 36a3a473662..79af34db769 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtDeclaration; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; import org.jetbrains.kotlin.resolve.scopes.KtScope; import org.jetbrains.kotlin.types.KotlinType; @@ -95,7 +96,7 @@ public class JetTestFunctionDetector { } if (scope != null) { - Collection allDescriptors = scope.getAllDescriptors(); + Collection allDescriptors = scope.getDescriptors(DescriptorKindFilter.FUNCTIONS, KtScope.Companion.getALL_NAME_FILTER()); List testFunctions = ContainerUtil.mapNotNull( allDescriptors, new Function() { diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt index 9bb2234b97b..88f05e4c745 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidExpressionCodegenExtension.kt @@ -248,7 +248,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension { context.generateClearCacheFunction() if (androidClassType.fragment) { - val classMembers = descriptor.unsubstitutedMemberScope.getAllDescriptors() + val classMembers = descriptor.unsubstitutedMemberScope.getDescriptors() val onDestroy = classMembers.firstOrNull { it is FunctionDescriptor && it.isOnDestroyFunction() } if (onDestroy == null) { context.generateOnDestroyFunctionForFragment()