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

Renamed KtScope to MemberScope

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-04 14:40:18 +03:00
parent 748c0e7149
commit 6f9d9759ce
104 changed files with 323 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt
+3 -3
View File
@@ -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 <D : FunctionDescriptor> 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 <D : FunctionDescriptor> resolveSamAdapter(original: D): D?
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+3 -3
View File
@@ -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
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt
+2 -2
View File
@@ -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)
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
+4 -4
View File
@@ -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<Collection<DeclarationDescriptor>>(
{ 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
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BuiltInClassesAreSerializableOnJvm.kt
+3 -3
View File
@@ -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
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+7 -7
View File
@@ -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<KotlinJvmBinaryClass> packageParts) {
List<KtScope> list = new ArrayList<KtScope>();
public MemberScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull List<KotlinJvmBinaryClass> packageParts) {
List<MemberScope> list = new ArrayList<MemberScope>();
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
core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt
+1 -1
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+3 -3
View File
@@ -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();
}
core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt
+2 -2
View File
@@ -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
}
core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
+2 -2
View File
@@ -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)
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java
+6 -6
View File
@@ -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<? extends TypeProjection> typeArguments);
MemberScope getMemberScope(@NotNull List<? extends TypeProjection> 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
core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt
+2 -2
View File
@@ -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
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt
+2 -2
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java
+7 -7
View File
@@ -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<KotlinType> defaultType;
private final NotNullLazyValue<KtScope> unsubstitutedInnerClassesScope;
private final NotNullLazyValue<MemberScope> unsubstitutedInnerClassesScope;
private final NotNullLazyValue<ReceiverParameterDescriptor> 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<KtScope>() {
this.unsubstitutedInnerClassesScope = storageManager.createLazyValue(new Function0<MemberScope>() {
@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<? extends TypeProjection> typeArguments) {
public MemberScope getMemberScope(@NotNull List<? extends TypeProjection> 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);
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java
+5 -5
View File
@@ -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.<TypeProjection>emptyList(),
new LazyScopeAdapter(storageManager.createLazyValue(
new Function0<KtScope>() {
new Function0<MemberScope>() {
@Override
public KtScope invoke() {
List<KtScope> scopes = new ArrayList<KtScope>();
public MemberScope invoke() {
List<MemberScope> scopes = new ArrayList<MemberScope>();
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()])
);
}
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java
+6 -6
View File
@@ -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<ConstructorDescriptor> 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<ConstructorDescriptor> 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;
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+8 -8
View File
@@ -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<Collection<Name>> 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<Name, Collection<FunctionDescriptor>> functions;
private final MemoizedFunctionToNotNull<Name, Collection<PropertyDescriptor>> properties;
private final NotNullLazyValue<Collection<DeclarationDescriptor>> allDescriptors;
@@ -223,7 +223,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
}
@NotNull
private KtScope getSupertypeScope() {
private MemberScope getSupertypeScope() {
Collection<KotlinType> 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();
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyPackageViewDescriptorImpl.kt
+3 -3
View File
@@ -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)
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java
+9 -9
View File
@@ -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<? extends TypeProjection> typeArguments) {
KtScope memberScope = original.getMemberScope(typeArguments);
public MemberScope getMemberScope(@NotNull List<? extends TypeProjection> 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();
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt
+2 -2
View File
@@ -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)
}
core/descriptors/src/org/jetbrains/kotlin/incremental/utils.kt
+2 -2
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+3 -3
View File
@@ -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<DeclarationDescriptor> getAllDescriptors(@NotNull KtScope scope) {
return scope.getDescriptors(DescriptorKindFilter.ALL, KtScope.Companion.getALL_NAME_FILTER());
public static Collection<DeclarationDescriptor> getAllDescriptors(@NotNull MemberScope scope) {
return scope.getDescriptors(DescriptorKindFilter.ALL, MemberScope.Companion.getALL_NAME_FILTER());
}
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt
+3 -3
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt
+2 -2
View File
@@ -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?
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt
+1 -1
View File
@@ -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()
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.scopes
import org.jetbrains.kotlin.storage.NotNullLazyValue
public class LazyScopeAdapter(private val scope: NotNullLazyValue<KtScope>) : AbstractScopeAdapter() {
override val workerScope: KtScope
public class LazyScopeAdapter(private val scope: NotNullLazyValue<MemberScope>) : AbstractScopeAdapter() {
override val workerScope: MemberScope
get() = scope()
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScope.kt → core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScope.kt
+4 -4
View File
@@ -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<DeclarationDescriptor> {
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/KtScopeImpl.kt → core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/MemberScopeImpl.kt
+1 -1
View File
@@ -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<PropertyDescriptor> = emptyList()
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt
+1 -1
View File
@@ -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<FunctionDescriptor> by lazy {
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt
+1 -1
View File
@@ -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<DeclarationDescriptor, DeclarationDescriptor?>? = null
core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt
+2 -2
View File
@@ -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()
core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java
+2 -2
View File
@@ -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();
}
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+12 -12
View File
@@ -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.<TypeParameterDescriptor>emptyList(), Collections.<ValueParameterDescriptor>emptyList(),
Visibilities.INTERNAL);
KtScope memberScope = createErrorScope(getName().asString());
MemberScope memberScope = createErrorScope(getName().asString());
errorConstructor.setReturnType(
new ErrorTypeImpl(
createErrorTypeConstructorWithCustomDebugName("<ERROR>", this),
@@ -305,13 +305,13 @@ public class ErrorUtils {
@NotNull
@Override
public KtScope getMemberScope(@NotNull List<? extends TypeProjection> typeArguments) {
public MemberScope getMemberScope(@NotNull List<? extends TypeProjection> 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<TypeProjection> arguments;
private ErrorTypeImpl(
@NotNull TypeConstructor constructor,
@NotNull KtScope memberScope,
@NotNull MemberScope memberScope,
@NotNull List<TypeProjection> 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.<TypeProjection>emptyList());
}
@@ -532,7 +532,7 @@ public class ErrorUtils {
@NotNull
@Override
public KtScope getMemberScope() {
public MemberScope getMemberScope() {
return memberScope;
}
core/descriptors/src/org/jetbrains/kotlin/types/KotlinType.java
+2 -2
View File
@@ -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();
core/descriptors/src/org/jetbrains/kotlin/types/KotlinTypeImpl.kt
+5 -5
View File
@@ -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<TypeProjection>,
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<TypeProjection>,
memberScope: KtScope): KotlinTypeImpl
memberScope: MemberScope): KotlinTypeImpl
= KotlinTypeImpl(annotations, constructor, nullable, arguments, null, memberScope)
@@ -46,7 +46,7 @@ private constructor(
nullable: Boolean,
arguments: List<TypeProjection>,
substitution: TypeSubstitution,
memberScope: KtScope,
memberScope: MemberScope,
capabilities: TypeCapabilities
): KotlinTypeImpl {
if (capabilities !== TypeCapabilities.NONE) {
@@ -72,7 +72,7 @@ private constructor(
nullable: Boolean,
arguments: List<TypeProjection>,
substitution: TypeSubstitution?,
memberScope: KtScope,
memberScope: MemberScope,
private val typeCapabilities: TypeCapabilities
) : KotlinTypeImpl(annotations, constructor, nullable, arguments, substitution, memberScope) {
override fun getCapabilities(): TypeCapabilities = typeCapabilities
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java
+4 -4
View File
@@ -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();
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+3 -3
View File
@@ -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,
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+2 -2
View File
@@ -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<ProtoBuf.Function>,
propertyList: Collection<ProtoBuf.Property>
) : KtScopeImpl() {
) : MemberScopeImpl() {
private data class ProtoKey(val name: Name, val isExtension: Boolean)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+3 -3
View File
@@ -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<T : Any>(override val jClass: Class<T>) : 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<KCallable<*>>
get() = getMembers(memberScope, declaredOnly = false, nonExtensions = true, extensions = true)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt
+2 -2
View File
@@ -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<FunctionDescriptor>
fun getMembers(scope: KtScope, declaredOnly: Boolean, nonExtensions: Boolean, extensions: Boolean): Sequence<KCallable<*>> {
fun getMembers(scope: MemberScope, declaredOnly: Boolean, nonExtensions: Boolean, extensions: Boolean): Sequence<KCallable<*>> {
val visitor = object : DeclarationDescriptorVisitorEmptyBodies<KCallable<*>?, Unit>() {
private fun skipCallable(descriptor: CallableMemberDescriptor): Boolean {
if (declaredOnly && !descriptor.getKind().isReal()) return true
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+2 -2
View File
@@ -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<KCallable<*>>
get() = getMembers(scope, declaredOnly = false, nonExtensions = true, extensions = true).toList()