From ed2a50ffcb076e872123e42ddf2980b5643855fe Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 31 Oct 2014 21:53:09 +0300 Subject: [PATCH] Minor --- .../lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt | 2 +- .../jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index ab0a86eeb4e..c7e648bc138 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -119,7 +119,7 @@ public abstract class AbstractLazyMemberScope() protected fun computeDescriptorsFromDeclaredElements(kindFilter: (JetScope.DescriptorKind) -> Boolean, - nameFilter: (Name) -> Boolean): Collection { + nameFilter: (Name) -> Boolean): List { val declarations = declarationProvider.getDeclarations(kindFilter, nameFilter) val result = ArrayList(declarations.size()) for (declaration in declarations) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt index a269d815447..5075590a596 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -45,7 +45,7 @@ public open class LazyClassMemberScope(resolveSession: ResolveSession, trace: BindingTrace) : AbstractLazyMemberScope(resolveSession, declarationProvider, thisClass, trace) { - private val descriptorsFromDeclaredElements = storageManager.createLazyValue> { + private val descriptorsFromDeclaredElements = storageManager.createLazyValue { computeDescriptorsFromDeclaredElements({true}, {true}) } private val extraDescriptors: NotNullLazyValue> = storageManager.createLazyValue {