Minor
This commit is contained in:
+1
-1
@@ -119,7 +119,7 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
|
|||||||
override fun getDeclarationsByLabel(labelName: Name) = setOf<DeclarationDescriptor>()
|
override fun getDeclarationsByLabel(labelName: Name) = setOf<DeclarationDescriptor>()
|
||||||
|
|
||||||
protected fun computeDescriptorsFromDeclaredElements(kindFilter: (JetScope.DescriptorKind) -> Boolean,
|
protected fun computeDescriptorsFromDeclaredElements(kindFilter: (JetScope.DescriptorKind) -> Boolean,
|
||||||
nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
|
nameFilter: (Name) -> Boolean): List<DeclarationDescriptor> {
|
||||||
val declarations = declarationProvider.getDeclarations(kindFilter, nameFilter)
|
val declarations = declarationProvider.getDeclarations(kindFilter, nameFilter)
|
||||||
val result = ArrayList<DeclarationDescriptor>(declarations.size())
|
val result = ArrayList<DeclarationDescriptor>(declarations.size())
|
||||||
for (declaration in declarations) {
|
for (declaration in declarations) {
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ public open class LazyClassMemberScope(resolveSession: ResolveSession,
|
|||||||
trace: BindingTrace)
|
trace: BindingTrace)
|
||||||
: AbstractLazyMemberScope<LazyClassDescriptor, ClassMemberDeclarationProvider>(resolveSession, declarationProvider, thisClass, trace) {
|
: AbstractLazyMemberScope<LazyClassDescriptor, ClassMemberDeclarationProvider>(resolveSession, declarationProvider, thisClass, trace) {
|
||||||
|
|
||||||
private val descriptorsFromDeclaredElements = storageManager.createLazyValue<Collection<DeclarationDescriptor>> {
|
private val descriptorsFromDeclaredElements = storageManager.createLazyValue {
|
||||||
computeDescriptorsFromDeclaredElements({true}, {true})
|
computeDescriptorsFromDeclaredElements({true}, {true})
|
||||||
}
|
}
|
||||||
private val extraDescriptors: NotNullLazyValue<Collection<DeclarationDescriptor>> = storageManager.createLazyValue {
|
private val extraDescriptors: NotNullLazyValue<Collection<DeclarationDescriptor>> = storageManager.createLazyValue {
|
||||||
|
|||||||
Reference in New Issue
Block a user