Optimize LazyScopeAdapter internals
This commit is contained in:
@@ -440,9 +440,9 @@ class TypeResolver(
|
||||
private fun getScopeForTypeParameter(c: TypeResolutionContext, typeParameterDescriptor: TypeParameterDescriptor): MemberScope {
|
||||
return when {
|
||||
c.checkBounds -> TypeIntersector.getUpperBoundsAsType(typeParameterDescriptor).memberScope
|
||||
else -> LazyScopeAdapter(LockBasedStorageManager.NO_LOCKS.createLazyValue {
|
||||
else -> LazyScopeAdapter {
|
||||
TypeIntersector.getUpperBoundsAsType(typeParameterDescriptor).memberScope
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -281,12 +281,12 @@ open class WrappedTypeParameterDescriptor(
|
||||
private val _defaultType: SimpleType by lazy {
|
||||
KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
|
||||
Annotations.EMPTY, typeConstructor, emptyList(), false,
|
||||
LazyScopeAdapter(LockBasedStorageManager.NO_LOCKS.createLazyValue {
|
||||
LazyScopeAdapter {
|
||||
TypeIntersectionScope.create(
|
||||
"Scope for type parameter " + name.asString(),
|
||||
upperBounds
|
||||
)
|
||||
})
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user