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 737e48b10e4..55c7abd6abf 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 @@ -54,7 +54,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static kotlin.collections.CollectionsKt.emptyList; import static kotlin.collections.CollectionsKt.firstOrNull; import static org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PRIVATE; import static org.jetbrains.kotlin.descriptors.DescriptorVisibilities.PUBLIC; @@ -130,7 +129,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes StorageManager storageManager = c.getStorageManager(); - this.scopesHolderForClass = createMemberScope(c, this.declarationProvider); + this.scopesHolderForClass = createScopesHolderForClass(c, this.declarationProvider); this.kind = classLikeInfo.getClassKind(); this.staticScope = kind == ClassKind.ENUM_CLASS ? new StaticScopeForKotlinEnum(storageManager, this) : MemberScope.Empty.INSTANCE; @@ -321,7 +320,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes // NOTE: Called from constructor! @NotNull - protected ScopesHolderForClass createMemberScope( + protected ScopesHolderForClass createScopesHolderForClass( @NotNull LazyClassContext c, @NotNull ClassMemberDeclarationProvider declarationProvider ) {