diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index ec0f0af4d3e..e7d37fdb57c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.types.KotlinType; @@ -468,7 +468,7 @@ public class ClosureCodegen extends MemberCodegen { ClassDescriptor elementClass = elementDescriptor.getExtensionReceiverParameter() == null ? DescriptorUtilsKt.getBuiltIns(elementDescriptor).getFunction(arity) : DescriptorUtilsKt.getBuiltIns(elementDescriptor).getExtensionFunction(arity); - KtScope scope = elementClass.getDefaultType().getMemberScope(); + MemberScope scope = elementClass.getDefaultType().getMemberScope(); return scope.getFunctions(OperatorNameConventions.INVOKE, NoLookupLocation.FROM_BACKEND).iterator().next(); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt index 589229bc29d..d3066d1956b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.diagnostics.DelegationToTraitImpl import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes.* import java.util.* @@ -65,7 +65,7 @@ public class InterfaceImplBodyCodegen( descriptor, Name.identifier(JvmAbi.DEFAULT_IMPLS_CLASS_NAME), Modality.FINAL, Collections.emptyList(), SourceElement.NO_SOURCE) - classDescriptorImpl.initialize(KtScope.empty(classDescriptorImpl), emptySet(), null) + classDescriptorImpl.initialize(MemberScope.empty(classDescriptorImpl), emptySet(), null) return classDescriptorImpl } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt index 03b3c29558c..c7de026bdb8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.MultifileClassPart import org.jetbrains.kotlin.resolve.jvm.diagnostics.OtherOrigin import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor @@ -70,7 +70,7 @@ public class MultifileClassCodegen( getDeserializedCallables(compiledPackageFragment) private fun getDeserializedCallables(compiledPackageFragment: PackageFragmentDescriptor) = - compiledPackageFragment.getMemberScope().getDescriptors(DescriptorKindFilter.CALLABLES, KtScope.ALL_NAME_FILTER).filterIsInstance() + compiledPackageFragment.getMemberScope().getDescriptors(DescriptorKindFilter.CALLABLES, MemberScope.ALL_NAME_FILTER).filterIsInstance() public val packageParts = PackageParts(facadeFqName.parent().asString()) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java index e01eca518ca..8541678aebf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MutableClassDescriptor.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase; import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorImpl; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeConstructor; @@ -160,14 +160,14 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class @Override @NotNull - public KtScope getUnsubstitutedMemberScope() { - return KtScope.Companion.empty(this); // used for getDefaultType + public MemberScope getUnsubstitutedMemberScope() { + return MemberScope.Companion.empty(this); // used for getDefaultType } @NotNull @Override - public KtScope getStaticScope() { - return KtScope.Companion.empty(this); + public MemberScope getStaticScope() { + return MemberScope.Companion.empty(this); } @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index 073fc22fa32..6f546e835b4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.EnumValue; import org.jetbrains.kotlin.resolve.constants.NullValue; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.org.objectweb.asm.Type; @@ -101,7 +101,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid { supertypes, KotlinSourceElementKt.toSourceElement(element) ); - classDescriptor.initialize(KtScope.Companion.empty(classDescriptor), Collections.emptySet(), null); + classDescriptor.initialize(MemberScope.Companion.empty(classDescriptor), Collections.emptySet(), null); bindingTrace.record(CLASS_FOR_CALLABLE, callableDescriptor, classDescriptor); return classDescriptor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 505922490f8..f9812150328 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.util.slicedMap.BasicWritableSlice; import org.jetbrains.kotlin.util.slicedMap.Slices; @@ -212,7 +212,7 @@ public class CodegenBinding { new ClassDescriptorImpl(descriptor, Name.special(""), Modality.FINAL, Collections.singleton(DescriptorUtilsKt.getBuiltIns(descriptor).getAnyType()), KotlinSourceElementKt.toSourceElement(script)); - classDescriptor.initialize(KtScope.Companion.empty(classDescriptor), Collections.emptySet(), null); + classDescriptor.initialize(MemberScope.Companion.empty(classDescriptor), Collections.emptySet(), null); recordClosure(trace, classDescriptor, null, asmType, fileClassesManager); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index 1b23d091e3b..a2c8030a99b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -63,7 +63,7 @@ import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.serialization.deserialization.DeserializedType; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.kotlin.types.*; @@ -307,7 +307,7 @@ public class JetTypeMapper { String facadeSimpleName; - KtScope scope = packageFragmentDescriptor.getMemberScope(); + MemberScope scope = packageFragmentDescriptor.getMemberScope(); if (scope instanceof AbstractScopeAdapter) { scope = ((AbstractScopeAdapter) scope).getActualScope(); } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt index 3d239f42617..107a1df32c1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice import org.jetbrains.kotlin.util.slicedMap.WritableSlice import org.jetbrains.kotlin.utils.emptyOrSingletonList @@ -127,7 +127,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera override fun getSubPackages(fqn: FqName, scope: GlobalSearchScope): Collection { val packageView = module.getPackage(fqn) - val members = packageView.memberScope.getDescriptors(DescriptorKindFilter.PACKAGES, KtScope.ALL_NAME_FILTER) + val members = packageView.memberScope.getDescriptors(DescriptorKindFilter.PACKAGES, MemberScope.ALL_NAME_FILTER) return ContainerUtil.mapNotNull(members, object : Function { override fun `fun`(member: DeclarationDescriptor): FqName? { if (member is PackageViewDescriptor) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt index 4facfd04d5a..e0f20094e71 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt @@ -29,14 +29,14 @@ import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import java.util.* public object SamConversionResolverImpl : SamConversionResolver { - override fun resolveSamConstructor(name: Name, scope: KtScope, location: LookupLocation): SamConstructorDescriptor? { + override fun resolveSamConstructor(name: Name, scope: MemberScope, location: LookupLocation): SamConstructorDescriptor? { val classifier = scope.getClassifier(name, location) as? LazyJavaClassDescriptor ?: return null if (classifier.getFunctionTypeForSamInterface() == null) return null return SingleAbstractMethodUtils.createSamConstructorFunction(scope.getContainingDeclaration(), classifier) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index cbed27bd7a0..5fa189b9f6c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.scopes.ChainedScope -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.PackageData import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents @@ -97,9 +97,9 @@ public class IncrementalPackageFragmentProvider( public val target: TargetId get() = this@IncrementalPackageFragmentProvider.target - val memberScope: NotNullLazyValue = storageManager.createLazyValue { + val memberScope: NotNullLazyValue = storageManager.createLazyValue { if (fqName !in fqNamesToLoad) { - KtScope.empty(this) + MemberScope.empty(this) } else { val moduleMapping = incrementalCache.getModuleMappingData()?.let { ModuleMapping.create(it) } @@ -128,7 +128,7 @@ public class IncrementalPackageFragmentProvider( } if (scopes.isEmpty()) { - KtScope.empty(this) + MemberScope.empty(this) } else { ChainedScope(this, "Member scope for incremental compilation: union of package parts data", *scopes.toTypedArray()) @@ -142,7 +142,7 @@ public class IncrementalPackageFragmentProvider( return IncrementalMultifileClassPackageFragment(multifileClassFqName, partsNames) } - override fun getMemberScope(): KtScope = memberScope() + override fun getMemberScope(): MemberScope = memberScope() public inner class IncrementalMultifileClassPackageFragment( val multifileClassFqName: FqName, @@ -151,16 +151,16 @@ public class IncrementalPackageFragmentProvider( val memberScope = storageManager.createLazyValue { val partsData = partsNames.map { incrementalCache.getPackagePartData(it) }.filterNotNull() if (partsData.isEmpty()) - KtScope.empty(this) + MemberScope.empty(this) else { val scopes = partsData.map { IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(it.data, it.strings)) } ChainedScope(this, "Member scope for incremental compilation: union of multifile class parts data for $multifileClassFqName", - *scopes.toTypedArray()) + *scopes.toTypedArray()) } } - override fun getMemberScope(): KtScope = memberScope() + override fun getMemberScope(): MemberScope = memberScope() } private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope( diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java index 86c5713744f..741c0c2ee72 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.KotlinTypeImpl; import org.jetbrains.kotlin.types.TypeProjectionImpl; @@ -67,7 +67,7 @@ class PropagationHeuristics { arrayTypeFromSuper.getConstructor(), arrayTypeFromSuper.isMarkedNullable(), Arrays.asList(new TypeProjectionImpl(Variance.OUT_VARIANCE, elementTypeInSuper)), - KtScope.Companion.empty(elementType.getMemberScope().getContainingDeclaration())); + MemberScope.Companion.empty(elementType.getMemberScope().getContainingDeclaration())); data.reportError("Return type is not a subtype of overridden method. " + "To fix it, add annotation with Kotlin signature to super method with type " diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index b7201fe1aec..31a4febc47e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapperKt; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.*; import java.util.*; @@ -401,7 +401,7 @@ public class SignaturesPropagationData { boolean resultNullable = typeMustBeNullable(autoType, typesFromSuper, howThisTypeIsUsed); ClassifierDescriptor resultClassifier = modifyTypeClassifier(autoType, typesFromSuper); List resultArguments = getTypeArgsOfType(autoType, resultClassifier, typesFromSuper); - KtScope resultScope; + MemberScope resultScope; if (resultClassifier instanceof ClassDescriptor) { resultScope = ((ClassDescriptor) resultClassifier).getMemberScope(resultArguments); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java index f2bba364853..b9bd5d7665a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.*; import java.util.*; @@ -148,7 +148,7 @@ public class TypeTransformingVisitor extends KtVisitor { altArguments.add(getAltArgument(type, typeConstructor, i, arguments.get(i))); } - KtScope memberScope; + MemberScope memberScope; if (typeConstructorClassifier instanceof TypeParameterDescriptor) { memberScope = typeConstructorClassifier.getDefaultType().getMemberScope(); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt index d195ab6cf35..ec01d023ceb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/platform/JvmPlatform.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.PlatformConfigurator import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import java.util.* public object JvmPlatform : TargetPlatform("JVM") { @@ -50,8 +50,8 @@ private val DEFAULT_IMPORTS_FOR_JVM = ArrayList().apply { add(ImportPath("kotlin.jvm.*")) add(ImportPath("kotlin.io.*")) - fun addAllClassifiersFromScope(scope: KtScope) { - for (descriptor in scope.getDescriptors(DescriptorKindFilter.CLASSIFIERS, KtScope.ALL_NAME_FILTER)) { + fun addAllClassifiersFromScope(scope: MemberScope) { + for (descriptor in scope.getDescriptors(DescriptorKindFilter.CLASSIFIERS, MemberScope.ALL_NAME_FILTER)) { add(ImportPath(DescriptorUtils.getFqNameSafe(descriptor), false)) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java index e647825dcba..796ecfc7bf6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java @@ -22,17 +22,17 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.scopes.*; public class MutablePackageFragmentDescriptor extends PackageFragmentDescriptorImpl { - private final KtScope scope; + private final MemberScope scope; public MutablePackageFragmentDescriptor(@NotNull ModuleDescriptor module, @NotNull FqName fqName) { super(module, fqName); - scope = KtScope.Companion.empty(module); + scope = MemberScope.Companion.empty(module); } @NotNull @Override - public KtScope getMemberScope() { + public MemberScope getMemberScope() { return scope; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt index db619bd4389..e9f8ee8c476 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : AbstractScopeAdapter() { - override val workerScope: KtScope = packageDescriptor.memberScope + override val workerScope: MemberScope = packageDescriptor.memberScope override fun getPackage(name: Name): PackageViewDescriptor? = null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.kt index 74335011c08..b2f7162435f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.INCOMPATIBLE -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeIntersector import org.jetbrains.kotlin.types.checker.KotlinTypeChecker @@ -105,7 +105,7 @@ object OverloadUtil { private inline fun collectModulePackageMembersWithSameName( packageMembersByName: MultiMap, interestingDescriptors: Collection, - getMembersByName: (KtScope, Name) -> Collection + getMembersByName: (MemberScope, Name) -> Collection ) { val observedFQNs = hashSetOf() for (descriptor in interestingDescriptors) { @@ -122,7 +122,7 @@ object OverloadUtil { private inline fun getModulePackageMembersWithSameName( packageMember: CallableMemberDescriptor, - getMembersByName: (KtScope, Name) -> Collection + getMembersByName: (MemberScope, Name) -> Collection ): Collection { val containingPackage = packageMember.containingDeclaration if (containingPackage !is PackageFragmentDescriptor) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index eb145b7f21f..32ced81b333 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScope import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallableDescriptors import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.resolve.lazy.LazyEntity -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.storage.LockBasedStorageManager @@ -320,7 +320,7 @@ public class TypeResolver( return result ?: type(ErrorUtils.createErrorType(typeElement?.getDebugText() ?: "No type element")) } - private fun getScopeForTypeParameter(c: TypeResolutionContext, typeParameterDescriptor: TypeParameterDescriptor): KtScope { + private fun getScopeForTypeParameter(c: TypeResolutionContext, typeParameterDescriptor: TypeParameterDescriptor): MemberScope { return when { c.checkBounds -> TypeIntersector.getUpperBoundsAsType(typeParameterDescriptor).memberScope else -> LazyScopeAdapter(LockBasedStorageManager.NO_LOCKS.createLazyValue { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt index 3155afdeeee..a7dea2b25a5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil import org.jetbrains.kotlin.resolve.calls.util.CallMaker import org.jetbrains.kotlin.resolve.scopes.BaseLexicalScope import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope @@ -101,10 +101,10 @@ public fun resolvePossiblyAmbiguousCallableReference( ): OverloadResolutionResults? { val reference = callableReferenceExpression.getCallableReference() - fun resolveInScope(traceTitle: String, staticScope: KtScope): OverloadResolutionResults { + fun resolveInScope(traceTitle: String, staticScope: MemberScope): OverloadResolutionResults { // todo: drop this class when new resolve will be finished - class StaticScopeAsLexicalScope(val staticScope: KtScope) : BaseLexicalScope(staticScope.memberScopeAsImportingScope(), staticScope.getContainingDeclaration()) { + class StaticScopeAsLexicalScope(val staticScope: MemberScope) : BaseLexicalScope(staticScope.memberScopeAsImportingScope(), staticScope.getContainingDeclaration()) { override fun printStructure(p: Printer) { p.println(toString()) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt index 8ebc7b2814b..2231fc0a388 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.Constrain import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.TYPE_BOUND_POSITION import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.derivedFrom import org.jetbrains.kotlin.resolve.descriptorUtil.* -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.TypeUtils.DONT_CARE import org.jetbrains.kotlin.types.checker.KotlinTypeChecker @@ -165,7 +165,7 @@ public class ConstraintSystemImpl : ConstraintSystem { val TypeParameterDescriptor.correspondingType: KotlinType get() = cachedTypeForVariable.getOrPut(this) { - KotlinTypeImpl.create(Annotations.EMPTY, this.getTypeConstructor(), false, listOf(), KtScope.empty(this)) + KotlinTypeImpl.create(Annotations.EMPTY, this.getTypeConstructor(), false, listOf(), MemberScope.empty(this)) } fun KotlinType.isProper() = !TypeUtils.containsSpecialType(this) { @@ -573,7 +573,7 @@ public fun createTypeSubstitutor(conversion: (TypeParameterDescriptor) -> TypePa if (descriptor !is TypeParameterDescriptor) return null val typeParameterDescriptor = conversion(descriptor) ?: return null - val type = KotlinTypeImpl.create(Annotations.EMPTY, typeParameterDescriptor.getTypeConstructor(), false, listOf(), KtScope.empty(typeParameterDescriptor)) + val type = KotlinTypeImpl.create(Annotations.EMPTY, typeParameterDescriptor.getTypeConstructor(), false, listOf(), MemberScope.empty(typeParameterDescriptor)) return TypeProjectionImpl(type) } }) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt index dd4d3e00e62..bf4ddbb8835 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.DescriptorFactory import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollector import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver import org.jetbrains.kotlin.types.KotlinType @@ -43,7 +43,7 @@ class DynamicCallableDescriptors(private val builtIns: KotlinBuiltIns) { val dynamicType = createDynamicType(builtIns) - fun createDynamicDescriptorScope(call: Call, owner: DeclarationDescriptor) = object : KtScopeImpl() { + fun createDynamicDescriptorScope(call: Call, owner: DeclarationDescriptor) = object : MemberScopeImpl() { override fun getContainingDeclaration() = owner override fun printScopeStructure(p: Printer) { 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 9831c14a21f..b21a7f10a51 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java @@ -23,7 +23,7 @@ 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.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.*; import java.util.Collection; @@ -38,7 +38,7 @@ public class ForceResolveUtil { return descriptor; } - public static void forceResolveAllContents(@NotNull KtScope scope) { + public static void forceResolveAllContents(@NotNull MemberScope scope) { forceResolveAllContents(DescriptorUtils.getAllDescriptors(scope)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index 7e61da3f909..51f0831a9bd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.storage.LockBasedLazyResolveStorageManager; import javax.inject.Inject; @@ -66,7 +66,7 @@ public class LazyDeclarationResolver { @NotNull public ClassDescriptor getClassDescriptor(@NotNull KtClassOrObject classOrObject, @NotNull LookupLocation location) { - KtScope scope = getMemberScopeDeclaredIn(classOrObject, location); + MemberScope scope = getMemberScopeDeclaredIn(classOrObject, location); // Why not use the result here. Because it may be that there is a redeclaration: // class A {} class A { fun foo(): A} @@ -147,7 +147,7 @@ public class LazyDeclarationResolver { @Override public DeclarationDescriptor visitNamedFunction(@NotNull KtNamedFunction function, Void data) { LookupLocation location = lookupLocationFor(function, function.isTopLevel()); - KtScope scopeForDeclaration = getMemberScopeDeclaredIn(function, location); + MemberScope scopeForDeclaration = getMemberScopeDeclaredIn(function, location); scopeForDeclaration.getFunctions(function.getNameAsSafeName(), location); return getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, function); } @@ -203,7 +203,7 @@ public class LazyDeclarationResolver { @Override public DeclarationDescriptor visitProperty(@NotNull KtProperty property, Void data) { LookupLocation location = lookupLocationFor(property, property.isTopLevel()); - KtScope scopeForDeclaration = getMemberScopeDeclaredIn(property, location); + MemberScope scopeForDeclaration = getMemberScopeDeclaredIn(property, location); scopeForDeclaration.getProperties(property.getNameAsSafeName(), location); return getBindingContext().get(BindingContext.DECLARATION_TO_DESCRIPTOR, property); } @@ -226,7 +226,7 @@ public class LazyDeclarationResolver { } @NotNull - /*package*/ KtScope getMemberScopeDeclaredIn(@NotNull KtDeclaration declaration, @NotNull LookupLocation location) { + /*package*/ MemberScope getMemberScopeDeclaredIn(@NotNull KtDeclaration declaration, @NotNull LookupLocation location) { KtDeclaration parentDeclaration = KtStubbedPsiUtil.getContainingDeclaration(declaration); boolean isTopLevel = parentDeclaration == null; if (isTopLevel) { // for top level declarations we search directly in package because of possible conflicts with imports diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index 38538bafc83..b78547b880e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyAnnotations; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyAnnotationsContextImpl; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.storage.*; @@ -286,7 +286,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { @NotNull public ClassDescriptor getClassDescriptorForScript(@NotNull KtScript script) { - KtScope memberScope = lazyDeclarationResolver.getMemberScopeDeclaredIn(script, NoLookupLocation.FOR_SCRIPT); + MemberScope memberScope = lazyDeclarationResolver.getMemberScopeDeclaredIn(script, NoLookupLocation.FOR_SCRIPT); FqName fqName = ScriptNameUtil.classNameForScript(script); ClassifierDescriptor classifier = memberScope.getClassifier(fqName.shortName(), NoLookupLocation.FOR_SCRIPT); assert classifier != null : "No descriptor for " + fqName + " in file " + script.getContainingFile(); @@ -350,7 +350,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { @NotNull LazyPackageDescriptor current ) { result.add(current); - for (FqName subPackage : packageFragmentProvider.getSubPackagesOf(current.getFqName(), KtScope.Companion.getALL_NAME_FILTER())) { + for (FqName subPackage : packageFragmentProvider.getSubPackagesOf(current.getFqName(), MemberScope.Companion.getALL_NAME_FILTER())) { LazyPackageDescriptor fragment = getPackageFragment(subPackage); assert fragment != null : "Couldn't find fragment for " + subPackage; collectAllPackages(result, fragment); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java index bf48cbae275..fdc89dad5fb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.*; import org.jetbrains.kotlin.psi.KtNamedDeclaration; import org.jetbrains.kotlin.psi.KtNamedDeclarationUtil; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import java.util.ArrayList; import java.util.Collection; @@ -76,10 +76,10 @@ public class ResolveSessionUtils { } @Nullable - public static ClassDescriptor findByQualifiedName(@NotNull KtScope outerScope, @NotNull FqName path) { + public static ClassDescriptor findByQualifiedName(@NotNull MemberScope outerScope, @NotNull FqName path) { if (path.isRoot()) return null; - KtScope scope = outerScope; + MemberScope scope = outerScope; for (Name name : path.pathSegments()) { ClassifierDescriptor classifier = scope.getClassifier(name, NoLookupLocation.WHEN_FIND_BY_FQNAME); if (!(classifier instanceof ClassDescriptor)) return null; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 22fb8927087..324d2959401 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.storage.StorageManager @@ -43,7 +43,7 @@ protected constructor( protected val declarationProvider: DP, protected val thisDescriptor: D, protected val trace: BindingTrace -) : KtScopeImpl() { +) : MemberScopeImpl() { protected val storageManager: StorageManager = c.storageManager private val classDescriptors: MemoizedFunctionToNotNull> = storageManager.createMemoizedFunction { resolveClassDescriptor(it) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt index e6737d4ae2b..170072754f5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/ClassResolutionScopesSupport.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalChainedScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.LexicalScopeImpl @@ -108,7 +108,7 @@ class ClassResolutionScopesSupport( ownerDescriptor: DeclarationDescriptor, classDescriptor: ClassDescriptor ): LexicalScope { - val staticScopes = ArrayList(3) + val staticScopes = ArrayList(3) // todo filter fake overrides staticScopes.add(classDescriptor.staticScope) 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 12c02f1ee6d..43bf123ad83 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,7 +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.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; @@ -95,7 +95,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private final MemoizedFunctionToNotNull extraCompanionObjectDescriptors; private final LazyClassMemberScope unsubstitutedMemberScope; - private final KtScope staticScope; + private final MemberScope staticScope; private final NullableLazyValue forceResolveAllContents; private final boolean isCompanionObject; @@ -252,7 +252,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull @Override - public KtScope getUnsubstitutedMemberScope() { + public MemberScope getUnsubstitutedMemberScope() { return unsubstitutedMemberScope; } @@ -303,7 +303,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull @Override - public KtScope getStaticScope() { + public MemberScope getStaticScope() { return staticScope; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index d938fa5053e..81bc279d159 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike import org.jetbrains.kotlin.resolve.lazy.LazyClassContext 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.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker import org.jetbrains.kotlin.storage.NotNullLazyValue @@ -51,7 +51,7 @@ public open class LazyClassMemberScope( ) : AbstractLazyMemberScope(c, declarationProvider, thisClass, trace) { private val descriptorsFromDeclaredElements = storageManager.createLazyValue { - computeDescriptorsFromDeclaredElements(DescriptorKindFilter.ALL, KtScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) + computeDescriptorsFromDeclaredElements(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) } private val extraDescriptors: NotNullLazyValue> = storageManager.createLazyValue { computeExtraDescriptors(NoLookupLocation.FOR_ALREADY_TRACKED) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java index 031e7b3e2fb..856861b12e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -26,10 +26,10 @@ import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl implements LazyEntity { - private final KtScope memberScope; + private final MemberScope memberScope; private final PackageMemberDeclarationProvider declarationProvider; public LazyPackageDescriptor( @@ -50,7 +50,7 @@ public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl impleme @NotNull @Override - public KtScope getMemberScope() { + public MemberScope getMemberScope() { return memberScope; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt index cb950575e8e..011d963b914 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer -public class FilteringScope(private val workerScope: KtScope, private val predicate: (DeclarationDescriptor) -> Boolean) : KtScope { +public class FilteringScope(private val workerScope: MemberScope, private val predicate: (DeclarationDescriptor) -> Boolean) : MemberScope { override fun getFunctions(name: Name, location: LookupLocation) = workerScope.getFunctions(name, location).filter(predicate) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java index 78e1ca3a392..0982482ea52 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java @@ -32,8 +32,8 @@ public final class JetScopeUtils { private JetScopeUtils() {} @NotNull - public static KtScope getStaticNestedClassesScope(@NotNull ClassDescriptor descriptor) { - KtScope innerClassesScope = descriptor.getUnsubstitutedInnerClassesScope(); + public static MemberScope getStaticNestedClassesScope(@NotNull ClassDescriptor descriptor) { + MemberScope innerClassesScope = descriptor.getUnsubstitutedInnerClassesScope(); return new FilteringScope(innerClassesScope, new Function1() { @Override public Boolean invoke(DeclarationDescriptor descriptor) { @@ -125,7 +125,7 @@ public final class JetScopeUtils { @TestOnly @NotNull - public static String printStructure(@Nullable KtScope scope) { + public static String printStructure(@Nullable MemberScope scope) { StringBuilder out = new StringBuilder(); Printer p = new Printer(out); if (scope == null) { 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 2badb7126b2..77e4df62320 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/LexicalChainedScope.kt @@ -31,7 +31,7 @@ public class LexicalChainedScope @JvmOverloads constructor( override val isOwnerDescriptorAccessibleByLabel: Boolean, override val implicitReceiver: ReceiverParameterDescriptor?, private val debugName: String, - vararg memberScopes: KtScope, // todo JetScope -> MemberScope + vararg memberScopes: MemberScope, @Deprecated("This value is temporary hack for resolve -- don't use it!") val isStaticScope: Boolean = false ): LexicalScope { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt index b0424398a01..69866994d27 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/Scopes.kt @@ -33,7 +33,7 @@ interface HierarchicalScope { */ fun getContributedDescriptors( kindFilter: DescriptorKindFilter = DescriptorKindFilter.ALL, - nameFilter: (Name) -> Boolean = KtScope.ALL_NAME_FILTER + nameFilter: (Name) -> Boolean = MemberScope.ALL_NAME_FILTER ): Collection fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index 191946d3f12..c966efb27a0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.hasClassObjectType import org.jetbrains.kotlin.resolve.scopes.ChainedScope import org.jetbrains.kotlin.resolve.scopes.FilteringScope import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier import org.jetbrains.kotlin.resolve.scopes.utils.findPackage import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope @@ -56,7 +56,7 @@ public interface Qualifier: ReceiverValue { // package, classifier or companion object descriptor public val resultingDescriptor: DeclarationDescriptor - public val scope: KtScope + public val scope: MemberScope } abstract class QualifierReceiver( @@ -74,7 +74,7 @@ abstract class QualifierReceiver( (classifier as? ClassDescriptor)?.classObjectType?.let { ExpressionReceiver(referenceExpression, it) } ?: ReceiverValue.NO_RECEIVER - abstract fun getNestedClassesAndPackageMembersScope(): KtScope + abstract fun getNestedClassesAndPackageMembersScope(): MemberScope override fun getType(): KotlinType = throw IllegalStateException("No type corresponds to QualifierReceiver '$this'") @@ -88,9 +88,9 @@ class PackageQualifier( override val classifier: ClassifierDescriptor? get() = null - override val scope: KtScope get() = packageView.memberScope + override val scope: MemberScope get() = packageView.memberScope - override fun getNestedClassesAndPackageMembersScope(): KtScope = packageView.memberScope + override fun getNestedClassesAndPackageMembersScope(): MemberScope = packageView.memberScope override fun toString() = "Package{$packageView}" } @@ -102,12 +102,12 @@ class ClassifierQualifier( override val packageView: PackageViewDescriptor? get() = null - override val scope: KtScope get() { + override val scope: MemberScope get() { if (classifier !is ClassDescriptor) { - return KtScope.empty(classifier) + return MemberScope.empty(classifier) } - val scopes = ArrayList(3) + val scopes = ArrayList(3) val classObjectTypeScope = classifier.classObjectType?.memberScope?.let { FilteringScope(it) { it !is ClassDescriptor } @@ -123,12 +123,12 @@ class ClassifierQualifier( return ChainedScope(descriptor, "Member scope for $name as class or object", *scopes.toTypedArray()) } - override fun getNestedClassesAndPackageMembersScope(): KtScope { + override fun getNestedClassesAndPackageMembersScope(): MemberScope { if (classifier !is ClassDescriptor) { - return KtScope.empty(classifier) + return MemberScope.empty(classifier) } - val scopes = ArrayList(2) + val scopes = ArrayList(2) scopes.add(classifier.staticScope) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt index fd3d99c95ee..b3dd5adc0d3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt @@ -113,12 +113,12 @@ public fun HierarchicalScope.collectSyntheticExtensionFunctions(receiverTypes: C public fun HierarchicalScope.takeSnapshot(): HierarchicalScope = if (this is LexicalWritableScope) takeSnapshot() else this @JvmOverloads -public fun KtScope.memberScopeAsImportingScope(parentScope: ImportingScope? = null): ImportingScope = MemberScopeToImportingScopeAdapter(parentScope, this) +public fun MemberScope.memberScopeAsImportingScope(parentScope: ImportingScope? = null): ImportingScope = MemberScopeToImportingScopeAdapter(parentScope, this) @Deprecated("Temporary method for scope migration") -public fun KtScope.memberScopeAsLexicalScope(): LexicalScope = LexicalScope.empty(memberScopeAsImportingScope(), getContainingDeclaration()) +public fun MemberScope.memberScopeAsLexicalScope(): LexicalScope = LexicalScope.empty(memberScopeAsImportingScope(), getContainingDeclaration()) -private class MemberScopeToImportingScopeAdapter(override val parent: ImportingScope?, val memberScope: KtScope) : ImportingScope { +private class MemberScopeToImportingScopeAdapter(override val parent: ImportingScope?, val memberScope: MemberScope) : ImportingScope { override fun getContributedPackage(name: Name): PackageViewDescriptor? = memberScope.getPackage(name) override fun getContributedSyntheticExtensionProperties(receiverTypes: Collection, name: Name, location: LookupLocation) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java index f69df7300c6..5988e754a7f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; import org.jetbrains.kotlin.utils.DFS; @@ -230,7 +230,7 @@ public class CommonSupertypes { } ClassifierDescriptor classifier = constructor.getDeclarationDescriptor(); - KtScope newScope; + MemberScope newScope; if (classifier instanceof ClassDescriptor) { newScope = ((ClassDescriptor) classifier).getMemberScope(newProjections); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java index 7ea3f5ea278..e53f012ecd4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl; import org.jetbrains.kotlin.resolve.scopes.ChainedScope; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.*; @@ -124,7 +124,7 @@ public class TypeIntersector { TypeConstructor constructor = new IntersectionTypeConstructor(Annotations.Companion.getEMPTY(), resultingTypes); - KtScope[] scopes = new KtScope[resultingTypes.size()]; + MemberScope[] scopes = new MemberScope[resultingTypes.size()]; int i = 0; for (KotlinType type : resultingTypes) { scopes[i] = type.getMemberScope(); @@ -155,7 +155,7 @@ public class TypeIntersector { // TODO: check intersectability, don't use a chained scope private static class IntersectionScope extends ChainedScope { - public IntersectionScope(@NotNull TypeConstructor constructor, @NotNull KtScope[] scopes) { + public IntersectionScope(@NotNull TypeConstructor constructor, @NotNull MemberScope[] scopes) { super(null, "member scope for intersection type " + constructor, scopes); } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt index 37234e71e6b..224ee316fbc 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTaskHolder -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer @@ -62,7 +62,7 @@ class LazyOperationsLog( public fun getText(): String { val groupedByOwner = records.groupByTo(IdentityHashMap()) { val owner = it.data.fieldOwner - if (owner is KtScope) owner.getContainingDeclaration() else owner + if (owner is MemberScope) owner.getContainingDeclaration() else owner }.map { Pair(it.getKey(), it.getValue()) } return groupedByOwner.map { @@ -118,7 +118,7 @@ class LazyOperationsLog( sb.append(" = ${render(data.result)}") - if (data.fieldOwner is KtScope) { + if (data.fieldOwner is MemberScope) { sb.append(" // through ${render(data.fieldOwner)}") } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 2ea2661b166..1f7218a7496 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import java.io.IOException; import java.util.Collections; @@ -155,7 +155,7 @@ public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase return null; } - private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull KtScope memberScope) { + private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull MemberScope memberScope) { for (DeclarationDescriptor member : DescriptorUtils.getAllDescriptors(memberScope)) { member.acceptVoid(this); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt index a6356ea4432..7152e8dc88d 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.jvm.compiler -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.testFramework.UsefulTestCase @@ -28,13 +28,13 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.resolve.MemberComparator class DeserializedScopeValidationVisitor : ValidationVisitor() { - override fun validateScope(scope: KtScope, collector: DescriptorValidator.DiagnosticCollector) { + override fun validateScope(scope: MemberScope, collector: DescriptorValidator.DiagnosticCollector) { super.validateScope(scope, collector) validateDeserializedScope(scope) } } -private fun validateDeserializedScope(scope: KtScope) { +private fun validateDeserializedScope(scope: MemberScope) { val isPackageViewScope = scope.safeGetContainingDeclaration() is PackageViewDescriptor if (scope is DeserializedMemberScope || isPackageViewScope) { val relevantDescriptors = scope.getDescriptors().filter { member -> @@ -45,7 +45,7 @@ private fun validateDeserializedScope(scope: KtScope) { } //NOTE: see TypeUtils#IntersectionScope#getContainingDeclaration() -private fun KtScope.safeGetContainingDeclaration(): DeclarationDescriptor? { +private fun MemberScope.safeGetContainingDeclaration(): DeclarationDescriptor? { return try { getContainingDeclaration() } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java index 6155ddcfadb..adf36ffb900 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -27,7 +27,7 @@ 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; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import java.util.*; @@ -96,7 +96,7 @@ public class ExpectedLoadErrorsUtil { return null; } - private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull KtScope memberScope) { + private Void visitDeclarationRecursively(@NotNull DeclarationDescriptor descriptor, @NotNull MemberScope memberScope) { for (DeclarationDescriptor member : DescriptorUtils.getAllDescriptors(memberScope)) { member.acceptVoid(this); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 84222d078d6..01f14522f61 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -142,7 +142,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi val generatedPackageDir = File(tmpdir, LoadDescriptorUtil.TEST_PACKAGE_FQNAME.pathSegments().single().asString()) val allClassFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.class"), generatedPackageDir) - val packageScopes = arrayListOf() + val packageScopes = arrayListOf() val classes = arrayListOf() var shouldAddPackageView = false for (classFile in allClassFiles) { @@ -186,9 +186,9 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi } private class SyntheticPackageViewForTest(override val module: ModuleDescriptor, - packageScopes: List, + packageScopes: List, classes: List) : PackageViewDescriptor { - private val scope: KtScope + private val scope: MemberScope init { scope = ChainedScope(this, "synthetic package view for test", ScopeWithClassifiers(classes, this), *packageScopes.toTypedArray()) @@ -196,7 +196,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi override val fqName: FqName get() = LoadDescriptorUtil.TEST_PACKAGE_FQNAME - override val memberScope: KtScope + override val memberScope: MemberScope get() = scope override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R = visitor.visitPackageViewDescriptor(this, data) @@ -214,7 +214,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi private class ScopeWithClassifiers( classifiers: List, val ownerDescriptor: DeclarationDescriptor - ) : KtScopeImpl() { + ) : MemberScopeImpl() { override fun getContainingDeclaration() = ownerDescriptor private val classifierMap = HashMap() diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index cb8fc7c5477..b71ee11021d 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -42,7 +42,7 @@ 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.resolve.scopes.MemberScope; import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.types.TypeProjection; @@ -168,7 +168,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite @NotNull protected static FunctionDescriptor getFunctionDescriptor(@NotNull PackageFragmentDescriptor packageView, @NotNull String name) { Name functionName = Name.identifier(name); - KtScope memberScope = packageView.getMemberScope(); + MemberScope memberScope = packageView.getMemberScope(); Collection functions = memberScope.getFunctions(functionName, NoLookupLocation.FROM_TEST); assert functions.size() == 1 : "Failed to find function " + functionName + " in class" + "." + packageView.getName(); return functions.iterator().next(); @@ -177,7 +177,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite @NotNull private static FunctionDescriptor getFunctionDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name functionName = Name.identifier(name); - KtScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); Collection functions = memberScope.getFunctions(functionName, NoLookupLocation.FROM_TEST); assert functions.size() == 1 : "Failed to find function " + functionName + " in class" + "." + classDescriptor.getName(); return functions.iterator().next(); @@ -186,7 +186,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite @Nullable protected static PropertyDescriptor getPropertyDescriptor(@NotNull PackageFragmentDescriptor packageView, @NotNull String name, boolean failOnMissing) { Name propertyName = Name.identifier(name); - KtScope memberScope = packageView.getMemberScope(); + MemberScope memberScope = packageView.getMemberScope(); Collection properties = memberScope.getProperties(propertyName, NoLookupLocation.FROM_TEST); if (properties.isEmpty()) { for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(memberScope)) { @@ -213,7 +213,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite @NotNull private static PropertyDescriptor getPropertyDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name propertyName = Name.identifier(name); - KtScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); Collection properties = memberScope.getProperties(propertyName, NoLookupLocation.FROM_TEST); assert properties.size() == 1 : "Failed to find property " + propertyName + " in class " + classDescriptor.getName(); return properties.iterator().next(); @@ -231,7 +231,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLite @NotNull private static ClassDescriptor getInnerClassDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name propertyName = Name.identifier(name); - KtScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); ClassifierDescriptor innerClass = memberScope.getClassifier(propertyName, NoLookupLocation.FROM_TEST); assert innerClass instanceof ClassDescriptor : "Failed to find inner class " + propertyName + diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index c2f75ab8571..f4af7ecb456 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.TypeResolver import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.types.KotlinType @@ -66,7 +66,7 @@ public class ConstraintSystemTestData( val number = matcher.group(1)!! return KotlinTypeImpl.create( Annotations.EMPTY, IntegerValueTypeConstructor(number.toLong(), functionFoo.builtIns), false, listOf(), - KtScope.empty(functionFoo) + MemberScope.empty(functionFoo) ) } return typeResolver.resolveType( diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java index cc75d43dc97..5cc9783bd05 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java @@ -25,7 +25,7 @@ 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.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.KotlinType; import org.junit.Assert; @@ -84,7 +84,7 @@ public class DescriptorValidator { return this; } - protected void validateScope(@NotNull KtScope scope, @NotNull DiagnosticCollector collector) { + protected void validateScope(@NotNull MemberScope scope, @NotNull DiagnosticCollector collector) { for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(scope)) { if (recursiveFilter.apply(descriptor)) { descriptor.accept(new ScopeValidatorVisitor(collector), scope); @@ -358,7 +358,7 @@ public class DescriptorValidator { } - private static class ScopeValidatorVisitor implements DeclarationDescriptorVisitor { + private static class ScopeValidatorVisitor implements DeclarationDescriptorVisitor { private final DiagnosticCollector collector; public ScopeValidatorVisitor(DiagnosticCollector collector) { @@ -370,7 +370,7 @@ public class DescriptorValidator { } private void assertFound( - @NotNull KtScope scope, + @NotNull MemberScope scope, @NotNull DeclarationDescriptor expected, @Nullable DeclarationDescriptor found, boolean shouldBeSame @@ -384,7 +384,7 @@ public class DescriptorValidator { } private void assertFound( - @NotNull KtScope scope, + @NotNull MemberScope scope, @NotNull DeclarationDescriptor expected, @NotNull Collection found ) { @@ -395,14 +395,14 @@ public class DescriptorValidator { @Override public Void visitPackageFragmentDescriptor( - PackageFragmentDescriptor descriptor, KtScope scope + PackageFragmentDescriptor descriptor, MemberScope scope ) { return null; } @Override public Void visitPackageViewDescriptor( - PackageViewDescriptor descriptor, KtScope scope + PackageViewDescriptor descriptor, MemberScope scope ) { assertFound(scope, descriptor, scope.getPackage(descriptor.getName()), false); return null; @@ -410,7 +410,7 @@ public class DescriptorValidator { @Override public Void visitVariableDescriptor( - VariableDescriptor descriptor, KtScope scope + VariableDescriptor descriptor, MemberScope scope ) { assertFound(scope, descriptor, scope.getProperties(descriptor.getName(), NoLookupLocation.FROM_TEST)); return null; @@ -418,7 +418,7 @@ public class DescriptorValidator { @Override public Void visitFunctionDescriptor( - FunctionDescriptor descriptor, KtScope scope + FunctionDescriptor descriptor, MemberScope scope ) { assertFound(scope, descriptor, scope.getFunctions(descriptor.getName(), NoLookupLocation.FROM_TEST)); return null; @@ -426,7 +426,7 @@ public class DescriptorValidator { @Override public Void visitTypeParameterDescriptor( - TypeParameterDescriptor descriptor, KtScope scope + TypeParameterDescriptor descriptor, MemberScope scope ) { assertFound(scope, descriptor, scope.getClassifier(descriptor.getName(), NoLookupLocation.FROM_TEST), true); return null; @@ -434,7 +434,7 @@ public class DescriptorValidator { @Override public Void visitClassDescriptor( - ClassDescriptor descriptor, KtScope scope + ClassDescriptor descriptor, MemberScope scope ) { assertFound(scope, descriptor, scope.getClassifier(descriptor.getName(), NoLookupLocation.FROM_TEST), true); return null; @@ -442,7 +442,7 @@ public class DescriptorValidator { @Override public Void visitModuleDeclaration( - ModuleDescriptor descriptor, KtScope scope + ModuleDescriptor descriptor, MemberScope scope ) { report(descriptor, "Module found in scope: " + scope); return null; @@ -450,7 +450,7 @@ public class DescriptorValidator { @Override public Void visitConstructorDescriptor( - ConstructorDescriptor descriptor, KtScope scope + ConstructorDescriptor descriptor, MemberScope scope ) { report(descriptor, "Constructor found in scope: " + scope); return null; @@ -458,7 +458,7 @@ public class DescriptorValidator { @Override public Void visitScriptDescriptor( - ScriptDescriptor descriptor, KtScope scope + ScriptDescriptor descriptor, MemberScope scope ) { report(descriptor, "Script found in scope: " + scope); return null; @@ -466,21 +466,21 @@ public class DescriptorValidator { @Override public Void visitPropertyDescriptor( - PropertyDescriptor descriptor, KtScope scope + PropertyDescriptor descriptor, MemberScope scope ) { return visitVariableDescriptor(descriptor, scope); } @Override public Void visitValueParameterDescriptor( - ValueParameterDescriptor descriptor, KtScope scope + ValueParameterDescriptor descriptor, MemberScope scope ) { return visitVariableDescriptor(descriptor, scope); } @Override public Void visitPropertyGetterDescriptor( - PropertyGetterDescriptor descriptor, KtScope scope + PropertyGetterDescriptor descriptor, MemberScope scope ) { report(descriptor, "Getter found in scope: " + scope); return null; @@ -488,7 +488,7 @@ public class DescriptorValidator { @Override public Void visitPropertySetterDescriptor( - PropertySetterDescriptor descriptor, KtScope scope + PropertySetterDescriptor descriptor, MemberScope scope ) { report(descriptor, "Setter found in scope: " + scope); return null; @@ -496,7 +496,7 @@ public class DescriptorValidator { @Override public Void visitReceiverParameterDescriptor( - ReceiverParameterDescriptor descriptor, KtScope scope + ReceiverParameterDescriptor descriptor, MemberScope scope ) { report(descriptor, "Receiver parameter found in scope: " + scope); return null; diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index 977a5584087..3f48999889a 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.renderer.*; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.MemberComparator; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; @@ -128,7 +128,7 @@ public class RecursiveDescriptorComparator { ClassDescriptor klass = (ClassDescriptor) descriptor; appendSubDescriptors(descriptor, module, klass.getDefaultType().getMemberScope(), klass.getConstructors(), printer); - KtScope staticScope = klass.getStaticScope(); + MemberScope staticScope = klass.getStaticScope(); if (!DescriptorUtils.getAllDescriptors(staticScope).isEmpty()) { printer.println(); printer.println("// Static members"); @@ -185,7 +185,7 @@ public class RecursiveDescriptorComparator { private void appendSubDescriptors( @NotNull DeclarationDescriptor descriptor, @NotNull ModuleDescriptor module, - @NotNull KtScope memberScope, + @NotNull MemberScope memberScope, @NotNull Collection extraSubDescriptors, @NotNull Printer printer ) { diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java index 442ff31dff2..96b7f158c00 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.kotlin.resolve.scopes.*; -import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -84,7 +83,7 @@ public class DefaultModalityModifiersTest extends KotlinLiteFixture { } @NotNull - private LexicalScope createScope(@NotNull KtScope libraryScope) { + private LexicalScope createScope(@NotNull MemberScope libraryScope) { KtFile file = KtPsiFactoryKt .KtPsiFactory(getProject()).createFile("abstract class C { abstract fun foo(); abstract val a: Int }"); List declarations = file.getDeclarations(); diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java index f705428eb86..9fca4dfa1ff 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java @@ -34,7 +34,6 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPsiFactoryKt; @@ -105,7 +104,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { } }); return new LexicalChainedScope(typeParameters, module, false, null, "TypeSubstitutorTest::getContextScope()", - new KtScope[] { + new MemberScope[] { contextClass.getDefaultType().getMemberScope(), module.getBuiltIns().getBuiltInsPackageScope() }); diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index 06ae9250da0..1b45d5b4e4c 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.psi.KtTypeProjection; import org.jetbrains.kotlin.psi.KtTypeReference; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.scopes.*; -import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -200,7 +199,7 @@ public class TypeUnifierTest extends KotlinLiteFixture { return makeTypeProjection(builtIns.getBuiltInsPackageScope(), typeStr); } - private TypeProjection makeTypeProjection(KtScope scope, String typeStr) { + private TypeProjection makeTypeProjection(MemberScope scope, String typeStr) { LexicalScope withX = new LexicalScopeImpl(TypeTestUtilsKt.asLexicalScope(scope), scope.getContainingDeclaration(), false, null, "With X", RedeclarationHandler.DO_NOTHING, new Function1() { diff --git a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt index 14bbc05d26d..3e007e18a28 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.resolve.scopes.BaseLexicalScope -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope import org.jetbrains.kotlin.utils.Printer -public fun KtScope.asLexicalScope(): LexicalScope { +public fun MemberScope.asLexicalScope(): LexicalScope { val importingScope = memberScopeAsImportingScope() return object : BaseLexicalScope(importingScope, getContainingDeclaration()) { override fun printStructure(p: Printer) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt index 4002fad7d49..37c3366b584 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt @@ -22,19 +22,19 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.KotlinType public interface SamConversionResolver { public companion object EMPTY : SamConversionResolver { override fun resolveSamAdapter(original: D) = null - override fun resolveSamConstructor(name: Name, scope: KtScope, location: LookupLocation) = null + override fun resolveSamConstructor(name: Name, scope: MemberScope, location: LookupLocation) = null override fun resolveFunctionTypeIfSamInterface( classDescriptor: JavaClassDescriptor, resolveMethod: (JavaMethod) -> FunctionDescriptor ): KotlinType? = null } - public fun resolveSamConstructor(name: Name, scope: KtScope, location: LookupLocation): SamConstructorDescriptor? + public fun resolveSamConstructor(name: Name, scope: MemberScope, location: LookupLocation): SamConstructorDescriptor? public fun resolveSamAdapter(original: D): D? diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 7460e3aacbb..c9847a363c5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.resolve.scopes.InnerClassesScopeWrapper -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.toReadOnlyList @@ -92,10 +92,10 @@ class LazyJavaClassDescriptor( override fun getUnsubstitutedMemberScope() = unsubstitutedMemberScope private val innerClassesScope = InnerClassesScopeWrapper(getUnsubstitutedMemberScope()) - override fun getUnsubstitutedInnerClassesScope(): KtScope = innerClassesScope + override fun getUnsubstitutedInnerClassesScope(): MemberScope = innerClassesScope private val staticScope = LazyJavaStaticClassScope(c, jClass, this) - override fun getStaticScope(): KtScope = staticScope + override fun getStaticScope(): MemberScope = staticScope override fun getUnsubstitutedPrimaryConstructor(): ConstructorDescriptor? = null diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt index 0d47dfa425a..7bc806c9124 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.utils.addIfNotNull public class LazyJavaPackageScope( @@ -71,7 +71,7 @@ public class LazyJavaPackageScope( c.components.deserializedDescriptorResolver.readData(binaryClass, DeserializedDescriptorResolver.KOTLIN_PACKAGE_FACADE) } - KtScope.empty(packageFragment) + MemberScope.empty(packageFragment) } else { c.components.deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, containingDeclaration.kotlinBinaryClasses) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt index c487b015f53..9fbdc29103e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt @@ -41,8 +41,8 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude.NonExtensions import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScope +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeUtils @@ -54,11 +54,11 @@ import java.util.* public abstract class LazyJavaScope( protected val c: LazyJavaResolverContext, private val containingDeclaration: DeclarationDescriptor -) : KtScopeImpl() { +) : MemberScopeImpl() { // this lazy value is not used at all in LazyPackageFragmentScopeForJavaPackage because we do not use caching there // but is placed in the base class to not duplicate code private val allDescriptors = c.storageManager.createRecursionTolerantLazyValue>( - { computeDescriptors(DescriptorKindFilter.ALL, KtScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) }, + { computeDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) }, // This is to avoid the following recursive case: // when computing getAllPackageNames() we ask the JavaPsiFacade for all subpackages of foo // it, in turn, asks JavaElementFinder for subpackages of Kotlin package foo, which calls getAllPackageNames() recursively diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt index 2b1239010b8..f4da876500c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.platform.JvmBuiltIns import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor import org.jetbrains.kotlin.types.DelegatingType @@ -42,7 +42,7 @@ class BuiltInClassesAreSerializableOnJvm( private fun createMockJavaIoSerializableType(): KotlinType { val mockJavaIoPackageFragment = object : PackageFragmentDescriptorImpl(moduleDescriptor, FqName("java.io")) { - override fun getMemberScope() = KtScope.empty(this) + override fun getMemberScope() = MemberScope.empty(this) } //NOTE: can't reference anyType right away, because this is sometimes called when JvmBuiltIns are initializing @@ -56,7 +56,7 @@ class BuiltInClassesAreSerializableOnJvm( mockJavaIoPackageFragment, Name.identifier("Serializable"), Modality.ABSTRACT, superTypes, SourceElement.NO_SOURCE ) - mockSerializableClass.initialize(KtScope.empty(mockSerializableClass), emptySet(), null) + mockSerializableClass.initialize(MemberScope.empty(mockSerializableClass), emptySet(), null) return mockSerializableClass.defaultType } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index 97eced65a13..3fe28a956c6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.ChainedScope; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.ClassDataWithSource; import org.jetbrains.kotlin.serialization.PackageData; @@ -74,7 +74,7 @@ public final class DeserializedDescriptorResolver { } @Nullable - public KtScope createKotlinPackagePartScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) { + public MemberScope createKotlinPackagePartScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) { String[] data = readData(kotlinClass, KOTLIN_FILE_FACADE_OR_MULTIFILE_CLASS_PART); if (data != null) { String[] strings = kotlinClass.getClassHeader().getStrings(); @@ -95,18 +95,18 @@ public final class DeserializedDescriptorResolver { } @NotNull - public KtScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List packageParts) { - List list = new ArrayList(); + public MemberScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List packageParts) { + List list = new ArrayList(); for (KotlinJvmBinaryClass callable : packageParts) { - KtScope scope = createKotlinPackagePartScope(descriptor, callable); + MemberScope scope = createKotlinPackagePartScope(descriptor, callable); if (scope != null) { list.add(scope); } } if (list.isEmpty()) { - return KtScope.Companion.empty(descriptor); + return MemberScope.Companion.empty(descriptor); } - return new ChainedScope(descriptor, "Member scope for union of package parts data", list.toArray(new KtScope[list.size()])); + return new ChainedScope(descriptor, "Member scope for union of package parts data", list.toArray(new MemberScope[list.size()])); } @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt index 8b132578cad..0c2051076aa 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.jvm import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.load.java.sources.JavaSourceElement public var PLATFORM_TYPES: Boolean = true diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 9629f6c812a..b6f68f5ec94 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.constants.ConstantValue; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.*; @@ -202,12 +202,12 @@ public abstract class KotlinBuiltIns { } @NotNull - public KtScope getBuiltInsPackageScope() { + public MemberScope getBuiltInsPackageScope() { return builtinsPackageFragment.getMemberScope(); } @NotNull - public KtScope getAnnotationPackageScope() { + public MemberScope getAnnotationPackageScope() { return annotationPackageFragment.getMemberScope(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index e0810ec7402..a08783997bc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import org.jetbrains.kotlin.types.* import java.util.* @@ -32,7 +32,7 @@ import java.util.* val KOTLIN_REFLECT_FQ_NAME = FqName("kotlin.reflect") public class ReflectionTypes(private val module: ModuleDescriptor) { - private val kotlinReflectScope: KtScope by lazy { + private val kotlinReflectScope: MemberScope by lazy { module.getPackage(KOTLIN_REFLECT_FQ_NAME).memberScope } 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 47dbc3ecff3..4ee7c78a6d0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.Printer @@ -30,7 +30,7 @@ import java.util.ArrayList class FunctionClassScope( private val storageManager: StorageManager, private val functionClass: FunctionClassDescriptor -) : KtScopeImpl() { +) : MemberScopeImpl() { private val allDescriptors = storageManager.createLazyValue { if (functionClass.functionKind == FunctionClassDescriptor.Kind.Function) { val invoke = FunctionInvokeDescriptor.create(functionClass) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java index 77f3949af7d..c41959d3b57 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeSubstitution; @@ -30,19 +30,19 @@ import java.util.List; public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor, ClassOrPackageFragmentDescriptor { @NotNull - KtScope getMemberScope(@NotNull List typeArguments); + MemberScope getMemberScope(@NotNull List typeArguments); @NotNull - KtScope getMemberScope(@NotNull TypeSubstitution typeSubstitution); + MemberScope getMemberScope(@NotNull TypeSubstitution typeSubstitution); @NotNull - KtScope getUnsubstitutedMemberScope(); + MemberScope getUnsubstitutedMemberScope(); @NotNull - KtScope getUnsubstitutedInnerClassesScope(); + MemberScope getUnsubstitutedInnerClassesScope(); @NotNull - KtScope getStaticScope(); + MemberScope getStaticScope(); @NotNull @ReadOnly diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt index fd5dc97bdcc..e86b3754ab2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope public interface PackageFragmentDescriptor : ClassOrPackageFragmentDescriptor { @@ -25,5 +25,5 @@ public interface PackageFragmentDescriptor : ClassOrPackageFragmentDescriptor { public val fqName: FqName - public fun getMemberScope(): KtScope + public fun getMemberScope(): MemberScope } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt index 0eaee42f52a..18f0e4be64f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope public interface PackageViewDescriptor : DeclarationDescriptor { override fun getContainingDeclaration(): PackageViewDescriptor? public val fqName: FqName - public val memberScope: KtScope + public val memberScope: MemberScope public val module: ModuleDescriptor diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java index aa1b7e6df22..6a98d99afb4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.InnerClassesScopeWrapper; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; @@ -32,7 +32,7 @@ import java.util.List; public abstract class AbstractClassDescriptor implements ClassDescriptor { private final Name name; protected final NotNullLazyValue defaultType; - private final NotNullLazyValue unsubstitutedInnerClassesScope; + private final NotNullLazyValue unsubstitutedInnerClassesScope; private final NotNullLazyValue thisAsReceiverParameter; public AbstractClassDescriptor(@NotNull StorageManager storageManager, @NotNull Name name) { @@ -43,9 +43,9 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor { return TypeUtils.makeUnsubstitutedType(AbstractClassDescriptor.this, getUnsubstitutedMemberScope()); } }); - this.unsubstitutedInnerClassesScope = storageManager.createLazyValue(new Function0() { + this.unsubstitutedInnerClassesScope = storageManager.createLazyValue(new Function0() { @Override - public KtScope invoke() { + public MemberScope invoke() { return new InnerClassesScopeWrapper(getUnsubstitutedMemberScope()); } }); @@ -71,7 +71,7 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getUnsubstitutedInnerClassesScope() { + public MemberScope getUnsubstitutedInnerClassesScope() { return unsubstitutedInnerClassesScope.invoke(); } @@ -83,7 +83,7 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getMemberScope(@NotNull List typeArguments) { + public MemberScope getMemberScope(@NotNull List typeArguments) { assert typeArguments.size() == getTypeConstructor().getParameters().size() : "Illegal number of type arguments: expected " + getTypeConstructor().getParameters().size() + " but was " + typeArguments.size() + " for " + getTypeConstructor() + " " + getTypeConstructor().getParameters(); @@ -95,7 +95,7 @@ public abstract class AbstractClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { + public MemberScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { if (typeSubstitution.isEmpty()) return getUnsubstitutedMemberScope(); TypeSubstitutor substitutor = TypeSubstitutor.create(typeSubstitution); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java index 613fa90dfdc..cb26c7f8365 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.ChainedScope; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; @@ -76,17 +76,17 @@ public abstract class AbstractTypeParameterDescriptor extends DeclarationDescrip Annotations.Companion.getEMPTY(), getTypeConstructor(), false, Collections.emptyList(), new LazyScopeAdapter(storageManager.createLazyValue( - new Function0() { + new Function0() { @Override - public KtScope invoke() { - List scopes = new ArrayList(); + public MemberScope invoke() { + List scopes = new ArrayList(); for (KotlinType bound : getUpperBounds()) { scopes.add(bound.getMemberScope()); } return new ChainedScope( AbstractTypeParameterDescriptor.this, "Scope for type parameter " + name.asString(), - scopes.toArray(new KtScope[scopes.size()]) + scopes.toArray(new MemberScope[scopes.size()]) ); } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java index 30b66b2b88a..de36b6deb3b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.KotlinType; @@ -35,9 +35,9 @@ import java.util.Set; public class ClassDescriptorImpl extends ClassDescriptorBase { private final Modality modality; private final TypeConstructor typeConstructor; - private final KtScope staticScope = new StaticScopeForKotlinClass(this); + private final MemberScope staticScope = new StaticScopeForKotlinClass(this); - private KtScope unsubstitutedMemberScope; + private MemberScope unsubstitutedMemberScope; private Set constructors; private ConstructorDescriptor primaryConstructor; @@ -56,7 +56,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase { } public final void initialize( - @NotNull KtScope unsubstitutedMemberScope, + @NotNull MemberScope unsubstitutedMemberScope, @NotNull Set constructors, @Nullable ConstructorDescriptor primaryConstructor ) { @@ -89,13 +89,13 @@ public class ClassDescriptorImpl extends ClassDescriptorBase { @NotNull @Override - public KtScope getUnsubstitutedMemberScope() { + public MemberScope getUnsubstitutedMemberScope() { return unsubstitutedMemberScope; } @NotNull @Override - public KtScope getStaticScope() { + public MemberScope getStaticScope() { return staticScope; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index e976ffba259..a09d34da9b0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.kotlin.resolve.scopes.KtScope; -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl; import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; @@ -47,8 +47,8 @@ import java.util.Set; public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { private final TypeConstructor typeConstructor; private final ConstructorDescriptor primaryConstructor; - private final KtScope scope; - private final KtScope staticScope = new StaticScopeForKotlinClass(this); + private final MemberScope scope; + private final MemberScope staticScope = new StaticScopeForKotlinClass(this); private final NotNullLazyValue> enumMemberNames; /** @@ -93,13 +93,13 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { @NotNull @Override - public KtScope getUnsubstitutedMemberScope() { + public MemberScope getUnsubstitutedMemberScope() { return scope; } @NotNull @Override - public KtScope getStaticScope() { + public MemberScope getStaticScope() { return staticScope; } @@ -172,7 +172,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { return "enum entry " + getName(); } - private class EnumEntryScope extends KtScopeImpl { + private class EnumEntryScope extends MemberScopeImpl { private final MemoizedFunctionToNotNull> functions; private final MemoizedFunctionToNotNull> properties; private final NotNullLazyValue> allDescriptors; @@ -223,7 +223,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase { } @NotNull - private KtScope getSupertypeScope() { + private MemberScope getSupertypeScope() { Collection supertype = getTypeConstructor().getSupertypes(); assert supertype.size() == 1 : "Enum entry and its companion object both should have exactly one supertype: " + supertype; return supertype.iterator().next().getMemberScope(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt index 4f044f8db8d..9c429e3d2cc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.scopes.ChainedScope -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.getValue @@ -39,9 +39,9 @@ public class LazyPackageViewDescriptorImpl( module.packageFragmentProvider.getPackageFragments(fqName) } - override val memberScope: KtScope = LazyScopeAdapter(storageManager.createLazyValue { + override val memberScope: MemberScope = LazyScopeAdapter(storageManager.createLazyValue { if (fragments.isEmpty()) { - KtScope.empty(this) + MemberScope.empty(this) } else { val scopes = fragments.map { it.getMemberScope() } + SubpackagesScope(module, fqName) diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index 6144f8374dc..1b9eb9afe46 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.types.*; @@ -89,8 +89,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getMemberScope(@NotNull List typeArguments) { - KtScope memberScope = original.getMemberScope(typeArguments); + public MemberScope getMemberScope(@NotNull List typeArguments) { + MemberScope memberScope = original.getMemberScope(typeArguments); if (originalSubstitutor.isEmpty()) { return memberScope; } @@ -99,8 +99,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { - KtScope memberScope = original.getMemberScope(typeSubstitution); + public MemberScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { + MemberScope memberScope = original.getMemberScope(typeSubstitution); if (originalSubstitutor.isEmpty()) { return memberScope; } @@ -109,8 +109,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getUnsubstitutedMemberScope() { - KtScope memberScope = original.getUnsubstitutedMemberScope(); + public MemberScope getUnsubstitutedMemberScope() { + MemberScope memberScope = original.getUnsubstitutedMemberScope(); if (originalSubstitutor.isEmpty()) { return memberScope; } @@ -119,7 +119,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getStaticScope() { + public MemberScope getStaticScope() { return original.getStaticScope(); } @@ -233,7 +233,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor { @NotNull @Override - public KtScope getUnsubstitutedInnerClassesScope() { + public MemberScope getUnsubstitutedInnerClassesScope() { return original.getUnsubstitutedInnerClassesScope(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt index 6948f55ef9d..2e26a3eab72 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt @@ -23,13 +23,13 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.sure import java.util.ArrayList -public class SubpackagesScope(private val moduleDescriptor: ModuleDescriptor, private val fqName: FqName) : KtScopeImpl() { +public class SubpackagesScope(private val moduleDescriptor: ModuleDescriptor, private val fqName: FqName) : MemberScopeImpl() { override fun getContainingDeclaration(): DeclarationDescriptor { return moduleDescriptor.getPackage(fqName) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt b/core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt index 4eaac2da2c8..f58ca091a06 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope -public fun LookupTracker.record(from: LookupLocation, inScope: KtScope, name: Name) { +public fun LookupTracker.record(from: LookupLocation, inScope: MemberScope, name: Name) { if (this == LookupTracker.DO_NOTHING || from is NoLookupLocation) return val location = from.location ?: return diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index b473c65d543..88a5850dbfa 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -32,7 +32,7 @@ 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.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.LazyType; @@ -550,7 +550,7 @@ public class DescriptorUtils { } @NotNull - public static Collection getAllDescriptors(@NotNull KtScope scope) { - return scope.getDescriptors(DescriptorKindFilter.ALL, KtScope.Companion.getALL_NAME_FILTER()); + public static Collection getAllDescriptors(@NotNull MemberScope scope) { + return scope.getDescriptors(DescriptorKindFilter.ALL, MemberScope.Companion.getALL_NAME_FILTER()); } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt index c6f72b33011..b26a52f3aa5 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt @@ -24,10 +24,10 @@ import org.jetbrains.kotlin.utils.Printer /** * Introduces a simple wrapper for internal scope. */ -public abstract class AbstractScopeAdapter : KtScope { - protected abstract val workerScope: KtScope +public abstract class AbstractScopeAdapter : MemberScope { + protected abstract val workerScope: MemberScope - public fun getActualScope(): KtScope = + public fun getActualScope(): MemberScope = if (workerScope is AbstractScopeAdapter) (workerScope as AbstractScopeAdapter).getActualScope() else diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt index d9159d2e6e4..daaa9d7c2de 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.utils.Printer public open class ChainedScope( private val containingDeclaration: DeclarationDescriptor?/* it's nullable as a hack for TypeUtils.intersect() */, private val debugName: String, - vararg scopes: KtScope -) : KtScope { + vararg scopes: MemberScope +) : MemberScope { private val scopeChain = scopes.clone() override fun getClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt index 3c97d1af59e..620d610b21b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer -public class InnerClassesScopeWrapper(val workerScope: KtScope) : KtScopeImpl() { +public class InnerClassesScopeWrapper(val workerScope: MemberScope) : MemberScopeImpl() { override fun getContainingDeclaration(): DeclarationDescriptor { return workerScope.getContainingDeclaration() } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt index ee75d989943..2bb6b9e7a85 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.storage.NotNullLazyValue -public class LazyScopeAdapter(private val scope: NotNullLazyValue) : AbstractScopeAdapter() { - override val workerScope: KtScope +public class LazyScopeAdapter(private val scope: NotNullLazyValue) : AbstractScopeAdapter() { + override val workerScope: MemberScope get() = scope() } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt similarity index 98% rename from core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt index 52bbbbb3ec5..38e8a44dc8f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.toReadOnlyList import java.lang.reflect.Modifier -public interface KtScope { +public interface MemberScope { public fun getClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? @@ -51,8 +51,8 @@ public interface KtScope { public fun printScopeStructure(p: Printer) companion object { - public fun empty(ownerDescriptor: DeclarationDescriptor): KtScope { - return object : KtScopeImpl() { + public fun empty(ownerDescriptor: DeclarationDescriptor): MemberScope { + return object : MemberScopeImpl() { override fun getContainingDeclaration() = ownerDescriptor override fun toString() = "Empty scope with owner: $ownerDescriptor" @@ -70,7 +70,7 @@ public interface KtScope { /** * The same as getDescriptors(kindFilter, nameFilter) but the result is guaranteed to be filtered by kind and name. */ -public fun KtScope.getDescriptorsFiltered( +public fun MemberScope.getDescriptorsFiltered( kindFilter: DescriptorKindFilter = DescriptorKindFilter.ALL, nameFilter: (Name) -> Boolean = { true } ): Collection { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScopeImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScopeImpl.kt similarity index 97% rename from core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScopeImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScopeImpl.kt index 9364ebb5f09..f435ca4c0ca 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScopeImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScopeImpl.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer -abstract class KtScopeImpl : KtScope { +abstract class MemberScopeImpl : MemberScope { override fun getClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? = null override fun getProperties(name: Name, location: LookupLocation): Collection = emptyList() diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt index 1608298ff7a..85163d79ed1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt @@ -29,7 +29,7 @@ import java.util.* // We don't need to track lookups here since this scope used only for introduce special Enum class members public class StaticScopeForKotlinClass( private val containingClass: ClassDescriptor -) : KtScopeImpl() { +) : MemberScopeImpl() { override fun getClassifier(name: Name, location: LookupLocation) = null // TODO private val functions: List by lazy { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt index 0210458531b..0537d6f7a1c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.newHashSetWithExpectedSize import java.util.* -public class SubstitutingScope(private val workerScope: KtScope, private val substitutor: TypeSubstitutor) : KtScope { +public class SubstitutingScope(private val workerScope: MemberScope, private val substitutor: TypeSubstitutor) : MemberScope { private var substitutedDescriptors: MutableMap? = null diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt index 163d2ad36fa..2a4af142653 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.descriptors.annotations.Annotations public abstract class AbstractLazyType(storageManager: StorageManager) : AbstractKotlinType(), LazyType { @@ -41,7 +41,7 @@ public abstract class AbstractLazyType(storageManager: StorageManager) : Abstrac private val memberScope = storageManager.createLazyValue { computeMemberScope() } override fun getMemberScope() = memberScope() - protected open fun computeMemberScope(): KtScope { + protected open fun computeMemberScope(): MemberScope { val descriptor = constructor.getDeclarationDescriptor() return when (descriptor) { is TypeParameterDescriptor -> descriptor.getDefaultType().getMemberScope() diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java index 2b21af4c3b7..3dbdf84f413 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.List; @@ -52,7 +52,7 @@ public abstract class DelegatingType implements KotlinType { @NotNull @Override - public KtScope getMemberScope() { + public MemberScope getMemberScope() { return getDelegate().getMemberScope(); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 9c4eebcf50c..a9c68110d23 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.error.ErrorSimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.utils.Printer; @@ -160,7 +160,7 @@ public class ErrorUtils { return false; } - public static class ErrorScope implements KtScope { + public static class ErrorScope implements MemberScope { private final String debugMessage; private ErrorScope(@NotNull String debugMessage) { @@ -215,7 +215,7 @@ public class ErrorUtils { } } - private static class ThrowingScope implements KtScope { + private static class ThrowingScope implements MemberScope { private final String debugMessage; private ThrowingScope(@NotNull String message) { @@ -281,7 +281,7 @@ public class ErrorUtils { ConstructorDescriptorImpl errorConstructor = ConstructorDescriptorImpl.create(this, Annotations.Companion.getEMPTY(), true, SourceElement.NO_SOURCE); errorConstructor.initialize(Collections.emptyList(), Collections.emptyList(), Visibilities.INTERNAL); - KtScope memberScope = createErrorScope(getName().asString()); + MemberScope memberScope = createErrorScope(getName().asString()); errorConstructor.setReturnType( new ErrorTypeImpl( createErrorTypeConstructorWithCustomDebugName("", this), @@ -305,13 +305,13 @@ public class ErrorUtils { @NotNull @Override - public KtScope getMemberScope(@NotNull List typeArguments) { + public MemberScope getMemberScope(@NotNull List typeArguments) { return createErrorScope("Error scope for class " + getName() + " with arguments: " + typeArguments); } @NotNull @Override - public KtScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { + public MemberScope getMemberScope(@NotNull TypeSubstitution typeSubstitution) { return createErrorScope("Error scope for class " + getName() + " with arguments: " + typeSubstitution); } } @@ -322,12 +322,12 @@ public class ErrorUtils { } @NotNull - public static KtScope createErrorScope(@NotNull String debugMessage) { + public static MemberScope createErrorScope(@NotNull String debugMessage) { return createErrorScope(debugMessage, false); } @NotNull - public static KtScope createErrorScope(@NotNull String debugMessage, boolean throwExceptions) { + public static MemberScope createErrorScope(@NotNull String debugMessage, boolean throwExceptions) { if (throwExceptions) { return new ThrowingScope(debugMessage); } @@ -490,12 +490,12 @@ public class ErrorUtils { private static class ErrorTypeImpl implements KotlinType { private final TypeConstructor constructor; - private final KtScope memberScope; + private final MemberScope memberScope; private final List arguments; private ErrorTypeImpl( @NotNull TypeConstructor constructor, - @NotNull KtScope memberScope, + @NotNull MemberScope memberScope, @NotNull List arguments ) { this.constructor = constructor; @@ -503,7 +503,7 @@ public class ErrorUtils { this.arguments = arguments; } - private ErrorTypeImpl(@NotNull TypeConstructor constructor, @NotNull KtScope memberScope) { + private ErrorTypeImpl(@NotNull TypeConstructor constructor, @NotNull MemberScope memberScope) { this(constructor, memberScope, Collections.emptyList()); } @@ -532,7 +532,7 @@ public class ErrorUtils { @NotNull @Override - public KtScope getMemberScope() { + public MemberScope getMemberScope() { return memberScope; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinType.java b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinType.java index fed8f75fe63..01dfa3aa06f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinType.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.annotations.Annotated; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.List; @@ -42,7 +42,7 @@ public interface KotlinType extends Annotated { boolean isMarkedNullable(); @NotNull - KtScope getMemberScope(); + MemberScope getMemberScope(); boolean isError(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt index 620dfc3f1fb..bc281f85e12 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope public open class KotlinTypeImpl private constructor( @@ -27,7 +27,7 @@ private constructor( private val nullable: Boolean, private val arguments: List, private val substitution: TypeSubstitution?, - private val memberScope: KtScope + private val memberScope: MemberScope ) : AbstractKotlinType() { companion object { @@ -36,7 +36,7 @@ private constructor( constructor: TypeConstructor, nullable: Boolean, arguments: List, - memberScope: KtScope): KotlinTypeImpl + memberScope: MemberScope): KotlinTypeImpl = KotlinTypeImpl(annotations, constructor, nullable, arguments, null, memberScope) @@ -46,7 +46,7 @@ private constructor( nullable: Boolean, arguments: List, substitution: TypeSubstitution, - memberScope: KtScope, + memberScope: MemberScope, capabilities: TypeCapabilities ): KotlinTypeImpl { if (capabilities !== TypeCapabilities.NONE) { @@ -72,7 +72,7 @@ private constructor( nullable: Boolean, arguments: List, substitution: TypeSubstitution?, - memberScope: KtScope, + memberScope: MemberScope, private val typeCapabilities: TypeCapabilities ) : KotlinTypeImpl(annotations, constructor, nullable, arguments, substitution, memberScope) { override fun getCapabilities(): TypeCapabilities = typeCapabilities diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index 0107a312d03..f16b05831d9 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; import java.util.*; @@ -67,7 +67,7 @@ public class TypeUtils { @NotNull @Override - public KtScope getMemberScope() { + public MemberScope getMemberScope() { throw new IllegalStateException(name); } @@ -232,7 +232,7 @@ public class TypeUtils { } @NotNull - public static KotlinType makeUnsubstitutedType(ClassDescriptor classDescriptor, KtScope unsubstitutedMemberScope) { + public static KotlinType makeUnsubstitutedType(ClassDescriptor classDescriptor, MemberScope unsubstitutedMemberScope) { if (ErrorUtils.isError(classDescriptor)) { return ErrorUtils.createErrorType("Unsubstituted type for " + classDescriptor); } @@ -529,7 +529,7 @@ public class TypeUtils { @Override @NotNull - public KtScope getMemberScope() { + public MemberScope getMemberScope() { return delegate.getMemberScope(); } 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 c647435546b..037be2bc7af 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 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.DescriptorFactory import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf @@ -96,7 +96,7 @@ public class DeserializedClassDescriptor( override fun getAnnotations() = annotations - override fun getUnsubstitutedMemberScope(): KtScope = memberScope + override fun getUnsubstitutedMemberScope(): MemberScope = memberScope override fun getStaticScope() = staticScope @@ -189,7 +189,7 @@ public class DeserializedClassDescriptor( private inner class DeserializedClassMemberScope : DeserializedMemberScope(c, classProto.functionList, classProto.propertyList) { private val classDescriptor: DeserializedClassDescriptor get() = this@DeserializedClassDescriptor private val allDescriptors = c.storageManager.createLazyValue { - computeDescriptors(DescriptorKindFilter.ALL, KtScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) + computeDescriptors(DescriptorKindFilter.ALL, MemberScope.ALL_NAME_FILTER, NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS) } override fun getDescriptors(kindFilter: DescriptorKindFilter, 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 39d876fc29b..8577a1aa979 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 @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.record import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.serialization.deserialization.receiverType @@ -34,7 +34,7 @@ public abstract class DeserializedMemberScope protected constructor( protected val c: DeserializationContext, functionList: Collection, propertyList: Collection -) : KtScopeImpl() { +) : MemberScopeImpl() { private data class ProtoKey(val name: Name, val isExtension: Boolean) 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 f3837b16fa3..1e01a698882 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import kotlin.reflect.KCallable import kotlin.reflect.KClass @@ -55,9 +55,9 @@ internal class KClassImpl(override val jClass: Class) : KDeclaration private val classId: ClassId get() = RuntimeTypeMapper.mapJvmClassToKotlinClassId(jClass) - internal val memberScope: KtScope get() = descriptor.defaultType.memberScope + internal val memberScope: MemberScope get() = descriptor.defaultType.memberScope - internal val staticScope: KtScope get() = descriptor.staticScope + internal val staticScope: MemberScope get() = descriptor.staticScope override val members: Collection> get() = getMembers(memberScope, declaredOnly = false, nonExtensions = true, extensions = true) 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 064d8f882bd..31ad837c7df 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.load.java.structure.reflect.safeClassLoader import org.jetbrains.kotlin.load.kotlin.reflect.RuntimeModuleData import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf @@ -53,7 +53,7 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain abstract fun getFunctions(name: Name): Collection - fun getMembers(scope: KtScope, declaredOnly: Boolean, nonExtensions: Boolean, extensions: Boolean): Sequence> { + fun getMembers(scope: MemberScope, declaredOnly: Boolean, nonExtensions: Boolean, extensions: Boolean): Sequence> { val visitor = object : DeclarationDescriptorVisitorEmptyBodies?, Unit>() { private fun skipCallable(descriptor: CallableMemberDescriptor): Boolean { if (declaredOnly && !descriptor.getKind().isReal()) return true diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt index 112a394b735..7235c528fab 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.structure.reflect.classId import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import kotlin.jvm.internal.KotlinPackage import kotlin.reflect.KCallable import kotlin.reflect.KPackage @@ -35,7 +35,7 @@ internal class KPackageImpl(override val jClass: Class<*>, val moduleName: Strin } } - internal val scope: KtScope get() = descriptor().memberScope + internal val scope: MemberScope get() = descriptor().memberScope override val members: Collection> get() = getMembers(scope, declaredOnly = false, nonExtensions = true, extensions = true).toList() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index a1b7ccab776..e326039759b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.utils.sure import java.util.* @@ -136,7 +136,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh } override fun getSubPackages(fqn: FqName, scope: GlobalSearchScope): Collection { - return PackageIndexUtil.getSubPackageFqNames(fqn, kotlinSourceAndClassFiles(scope, project), project, KtScope.ALL_NAME_FILTER) + return PackageIndexUtil.getSubPackageFqNames(fqn, kotlinSourceAndClassFiles(scope, project), project, MemberScope.ALL_NAME_FILTER) } override fun getPsiClass(classOrObject: KtClassOrObject): PsiClass? { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt index 824e5678808..176a7740da6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope private fun PsiElement.getJavaDescriptorResolver(): JavaDescriptorResolver? { if (!ProjectRootsUtil.isInProjectOrLibraryClassFile(this)) return null @@ -78,7 +78,7 @@ public fun JavaDescriptorResolver.resolveField(field: JavaField): PropertyDescri return getContainingScope(field)?.getProperties(field.name, NoLookupLocation.FROM_IDE)?.findByJavaElement(field) as? PropertyDescriptor } -private fun JavaDescriptorResolver.getContainingScope(member: JavaMember): KtScope? { +private fun JavaDescriptorResolver.getContainingScope(member: JavaMember): MemberScope? { val containingClass = resolveClass(member.getContainingClass()) return if (member.isStatic()) containingClass?.getStaticScope() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt index a3f18e073f1..e1edc0d8574 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.scopes.KtScope -import org.jetbrains.kotlin.resolve.scopes.KtScopeImpl +import org.jetbrains.kotlin.resolve.scopes.MemberScope +import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.types.ErrorUtils.createErrorType import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.types.TypeSubstitution @@ -35,12 +35,12 @@ import org.jetbrains.kotlin.utils.Printer private class PackageFragmentWithMissingDependencies(override val fqName: FqName, moduleDescriptor: ModuleDescriptor) : PackageFragmentDescriptorImpl(moduleDescriptor, fqName) { - override fun getMemberScope(): KtScope { + override fun getMemberScope(): MemberScope { return ScopeWithMissingDependencies(fqName, this) } } -private class ScopeWithMissingDependencies(val fqName: FqName, val containing: DeclarationDescriptor) : KtScopeImpl() { +private class ScopeWithMissingDependencies(val fqName: FqName, val containing: DeclarationDescriptor) : MemberScopeImpl() { override fun getContainingDeclaration(): DeclarationDescriptor { return containing } @@ -74,7 +74,7 @@ private class MissingDependencyErrorClassDescriptor( val emptyConstructor = ConstructorDescriptorImpl.create(this, Annotations.EMPTY, true, SourceElement.NO_SOURCE) emptyConstructor.initialize(listOf(), listOf(), Visibilities.DEFAULT_VISIBILITY) emptyConstructor.setReturnType(createErrorType("")) - initialize(KtScope.empty(this), setOf(emptyConstructor), emptyConstructor) + initialize(MemberScope.empty(this), setOf(emptyConstructor), emptyConstructor) } override fun substitute(substitutor: TypeSubstitutor) = this diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt index a74c7674557..7e8dbf89051 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt @@ -126,7 +126,7 @@ private fun resolveParamLink(fromDescriptor: DeclarationDescriptor, qualifiedNam return getParamDescriptors(fromDescriptor).filter { it.getName().asString() == name } } -private fun getPackageInnerScope(descriptor: PackageFragmentDescriptor): KtScope { +private fun getPackageInnerScope(descriptor: PackageFragmentDescriptor): MemberScope { return descriptor.getContainingDeclaration().getPackage(descriptor.fqName).memberScope } 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 9fe5a4e088c..898bec5f6d9 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 @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import java.io.File import java.net.URL @@ -166,7 +166,7 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager: return url != null && VfsUtilCore.isUnder(url, builtInDirUrls) } - private fun getMemberScope(parent: DeclarationDescriptor?): KtScope? = when(parent) { + private fun getMemberScope(parent: DeclarationDescriptor?): MemberScope? = when(parent) { is ClassDescriptor -> parent.getDefaultType().getMemberScope() is PackageFragmentDescriptor -> parent.getMemberScope() else -> null diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt index cb3b11f2d75..6bd1c9367ce 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.project.ProjectStructureUtil import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered class AllClassesCompletion(private val parameters: CompletionParameters, @@ -56,7 +56,7 @@ class AllClassesCompletion(private val parameters: CompletionParameters, } } - private fun collectClassesFromScope(scope: KtScope, collector: (ClassDescriptor) -> Unit) { + private fun collectClassesFromScope(scope: MemberScope, collector: (ClassDescriptor) -> Unit) { for (descriptor in scope.getDescriptorsFiltered(DescriptorKindFilter.CLASSIFIERS)) { if (descriptor is ClassDescriptor) { if (kindFilter(descriptor.kind) && prefixMatcher.prefixMatches(descriptor.name.asString())) { diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java index be69fcd75f1..582e22f3d73 100644 --- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; @@ -109,7 +109,7 @@ public abstract class BaseKotlinVariableMacro extends Macro { private static Collection getAllVariables(LexicalScope scope) { Collection result = ContainerUtil.newArrayList(); - result.addAll(ScopeUtilsKt.collectDescriptorsFiltered(scope, DescriptorKindFilter.VARIABLES, KtScope.Companion.getALL_NAME_FILTER())); + result.addAll(ScopeUtilsKt.collectDescriptorsFiltered(scope, DescriptorKindFilter.VARIABLES, MemberScope.Companion.getALL_NAME_FILTER())); for (ReceiverParameterDescriptor implicitReceiver : ScopeUtilsKt.getImplicitReceiversHierarchy(scope)) { result.addAll(DescriptorUtils.getAllDescriptors(implicitReceiver.getType().getMemberScope())); } diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index 0dcd525fa98..a06edaf61b2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue @@ -265,7 +265,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert return ImportDescriptorResult.IMPORT_ADDED } - private fun getMemberScope(fqName: FqName, moduleDescriptor: ModuleDescriptor): KtScope? { + private fun getMemberScope(fqName: FqName, moduleDescriptor: ModuleDescriptor): MemberScope? { val packageView = moduleDescriptor.getPackage(fqName) if (!packageView.isEmpty()) { return packageView.memberScope diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index 925d36699c4..b05bd221229 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.name.* import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import org.junit.Assert import java.io.File @@ -263,7 +263,7 @@ public abstract class AbstractRenameTest : KotlinMultiFileTestCase() { } private fun doRenameInKotlinClassOrPackage( - renameParamsObject: JsonObject, context: TestContext, findDescriptorToRename: (KtScope) -> DeclarationDescriptor + renameParamsObject: JsonObject, context: TestContext, findDescriptorToRename: (MemberScope) -> DeclarationDescriptor ) { val classIdStr = renameParamsObject.getNullableString("classId") val packageFqnStr = renameParamsObject.getNullableString("packageFqn") diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt index da40485557a..51882a083a1 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.kotlin.resolve.scopes.KtScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.DescriptorSerializer import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.StringTableImpl @@ -193,7 +193,7 @@ public object KotlinJavascriptSerializationUtil { result.add(fqName) } - for (descriptor in packageView.memberScope.getDescriptors(DescriptorKindFilter.PACKAGES, KtScope.ALL_NAME_FILTER)) { + for (descriptor in packageView.memberScope.getDescriptors(DescriptorKindFilter.PACKAGES, MemberScope.ALL_NAME_FILTER)) { if (descriptor is PackageViewDescriptor) { getSubPackagesFqNames(descriptor, result) } 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 eb7f8396116..c01c109bcf8 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 @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.KotlinType; import java.util.Collection; @@ -84,7 +84,7 @@ public class JetTestFunctionDetector { ) { List answer = Lists.newArrayList(); for (KtDeclaration declaration : declarations) { - KtScope scope = null; + MemberScope scope = null; if (declaration instanceof KtClass) { KtClass klass = (KtClass) declaration; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java index 6c861acaeee..f8be8c13184 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.scopes.KtScope; +import org.jetbrains.kotlin.resolve.scopes.MemberScope; import java.util.*; @@ -153,7 +153,7 @@ public class ManglingUtils { private static String getSimpleMangledName(@NotNull CallableMemberDescriptor descriptor) { DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration(); - KtScope jetScope = null; + MemberScope jetScope = null; String nameToCompare = descriptor.getName().asString();