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

Workaround for tower resolution algorithm in kotlin code. Will be investigated.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-27 16:09:09 +03:00
parent cbe1ffed55
commit 1dca49cecc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+5 -3
View File
@@ -51,6 +51,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.resolve.OverridingUtil
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
import org.jetbrains.kotlin.storage.NotNullLazyValue
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
@@ -583,10 +584,11 @@ public class LazyJavaClassMemberScope(
if (jNestedClass == null) { if (jNestedClass == null) {
val field = enumEntryIndex()[name] val field = enumEntryIndex()[name]
if (field != null) { if (field != null) {
val createLazyValue: NotNullLazyValue<Collection<Name>> = c.storageManager.createLazyValue {
memberIndex().getAllFieldNames() + memberIndex().getMethodNames({ true })
}
EnumEntrySyntheticClassDescriptor.create(c.storageManager, ownerDescriptor, name, EnumEntrySyntheticClassDescriptor.create(c.storageManager, ownerDescriptor, name,
c.storageManager.createLazyValue { createLazyValue, c.resolveAnnotations(field), c.components.sourceElementFactory.source(field))
memberIndex().getAllFieldNames() + memberIndex().getMethodNames({ true })
}, c.resolveAnnotations(field), c.components.sourceElementFactory.source(field))
} }
else null else null
} }