From 811bf22375fce2d585cb7db9a89fc5196a8c8516 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 17 Dec 2013 17:33:50 +0400 Subject: [PATCH] Account for API changes --- .../java/lazy/descriptors/LazyJavaClassDescriptor.kt | 5 +---- .../resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 519a5838e36..d23ed7366f4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -40,7 +40,7 @@ class LazyJavaClassDescriptor( containingDeclaration: DeclarationDescriptor, internal val fqName: FqName, private val jClass: JavaClass -) : ClassDescriptorBase(containingDeclaration, fqName.shortName()), LazyJavaDescriptor, JavaClassDescriptor { +) : ClassDescriptorBase(outerC.storageManager, containingDeclaration, fqName.shortName()), LazyJavaDescriptor, JavaClassDescriptor { private val c: LazyJavaResolverContextWithTypes = outerC.child(this, jClass.getTypeParameters().toSet()); @@ -64,9 +64,6 @@ class LazyJavaClassDescriptor( private val _scopeForMemberLookup = LazyJavaClassMemberScope(c, this, jClass) override fun getScopeForMemberLookup() = _scopeForMemberLookup - private val _thisAsReceiverParameter = c.storageManager.createLazyValue { DescriptorFactory.createLazyReceiverParameterDescriptor(this) } - override fun getThisAsReceiverParameter() = _thisAsReceiverParameter() - private val _innerClassesScope = InnerClassesScopeWrapper(getScopeForMemberLookup()) override fun getUnsubstitutedInnerClassesScope(): JetScope = _innerClassesScope diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 48a5ec9f85b..e7512e65105 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -155,8 +155,7 @@ public abstract class LazyJavaMemberScope( effectiveSignature.getValueParameters(), effectiveSignature.getReturnType(), Modality.convertFromFlags(method.isAbstract(), !method.isFinal()), - method.getVisibility(), - false + method.getVisibility() ) if (record) { @@ -297,10 +296,6 @@ public abstract class LazyJavaMemberScope( override fun getProperties(name: Name): Collection = _properties(name) protected open fun getAllPropertyNames(): Collection = memberIndex().getAllFieldNames() - // No object can be defined in Java - override fun getObjectDescriptor(name: Name): ClassDescriptor? = null - override fun getObjectDescriptors() = emptyList() - override fun getLocalVariable(name: Name): VariableDescriptor? = null override fun getDeclarationsByLabel(labelName: LabelName) = emptyList()