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

Account for API changes

Browse Source
This commit is contained in:
Andrey Breslav
2013-12-17 17:33:50 +04:00
parent 0f9b9ed245
commit 811bf22375
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+1 -4
View File
@@ -40,7 +40,7 @@ class LazyJavaClassDescriptor(
containingDeclaration: DeclarationDescriptor, containingDeclaration: DeclarationDescriptor,
internal val fqName: FqName, internal val fqName: FqName,
private val jClass: JavaClass 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()); private val c: LazyJavaResolverContextWithTypes = outerC.child(this, jClass.getTypeParameters().toSet());
@@ -64,9 +64,6 @@ class LazyJavaClassDescriptor(
private val _scopeForMemberLookup = LazyJavaClassMemberScope(c, this, jClass) private val _scopeForMemberLookup = LazyJavaClassMemberScope(c, this, jClass)
override fun getScopeForMemberLookup() = _scopeForMemberLookup override fun getScopeForMemberLookup() = _scopeForMemberLookup
private val _thisAsReceiverParameter = c.storageManager.createLazyValue { DescriptorFactory.createLazyReceiverParameterDescriptor(this) }
override fun getThisAsReceiverParameter() = _thisAsReceiverParameter()
private val _innerClassesScope = InnerClassesScopeWrapper(getScopeForMemberLookup()) private val _innerClassesScope = InnerClassesScopeWrapper(getScopeForMemberLookup())
override fun getUnsubstitutedInnerClassesScope(): JetScope = _innerClassesScope override fun getUnsubstitutedInnerClassesScope(): JetScope = _innerClassesScope
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt
+1 -6
View File
@@ -155,8 +155,7 @@ public abstract class LazyJavaMemberScope(
effectiveSignature.getValueParameters(), effectiveSignature.getValueParameters(),
effectiveSignature.getReturnType(), effectiveSignature.getReturnType(),
Modality.convertFromFlags(method.isAbstract(), !method.isFinal()), Modality.convertFromFlags(method.isAbstract(), !method.isFinal()),
method.getVisibility(), method.getVisibility()
false
) )
if (record) { if (record) {
@@ -297,10 +296,6 @@ public abstract class LazyJavaMemberScope(
override fun getProperties(name: Name): Collection<VariableDescriptor> = _properties(name) override fun getProperties(name: Name): Collection<VariableDescriptor> = _properties(name)
protected open fun getAllPropertyNames(): Collection<Name> = memberIndex().getAllFieldNames() protected open fun getAllPropertyNames(): Collection<Name> = memberIndex().getAllFieldNames()
// No object can be defined in Java
override fun getObjectDescriptor(name: Name): ClassDescriptor? = null
override fun getObjectDescriptors() = emptyList<ClassDescriptor>()
override fun getLocalVariable(name: Name): VariableDescriptor? = null override fun getLocalVariable(name: Name): VariableDescriptor? = null
override fun getDeclarationsByLabel(labelName: LabelName) = emptyList<DeclarationDescriptor>() override fun getDeclarationsByLabel(labelName: LabelName) = emptyList<DeclarationDescriptor>()