Minor code simplifications
This commit is contained in:
@@ -48,9 +48,7 @@ public class ChainedScope(private val containingDeclaration: DeclarationDescript
|
|||||||
override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> {
|
override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> {
|
||||||
if (implicitReceiverHierarchy == null) {
|
if (implicitReceiverHierarchy == null) {
|
||||||
val result = ArrayList<ReceiverParameterDescriptor>()
|
val result = ArrayList<ReceiverParameterDescriptor>()
|
||||||
for (jetScope in scopeChain) {
|
scopeChain.flatMapTo(result) { it.getImplicitReceiversHierarchy() }
|
||||||
result.addAll(jetScope.getImplicitReceiversHierarchy())
|
|
||||||
}
|
|
||||||
result.trimToSize()
|
result.trimToSize()
|
||||||
implicitReceiverHierarchy = result
|
implicitReceiverHierarchy = result
|
||||||
}
|
}
|
||||||
@@ -59,14 +57,7 @@ public class ChainedScope(private val containingDeclaration: DeclarationDescript
|
|||||||
|
|
||||||
override fun getContainingDeclaration(): DeclarationDescriptor = containingDeclaration!!
|
override fun getContainingDeclaration(): DeclarationDescriptor = containingDeclaration!!
|
||||||
|
|
||||||
override fun getDeclarationsByLabel(labelName: Name): Collection<DeclarationDescriptor> {
|
override fun getDeclarationsByLabel(labelName: Name) = scopeChain.flatMap { it.getDeclarationsByLabel(labelName) }
|
||||||
val result = ArrayList<DeclarationDescriptor>()
|
|
||||||
for (jetScope in scopeChain) {
|
|
||||||
result.addAll(jetScope.getDeclarationsByLabel(labelName))
|
|
||||||
}
|
|
||||||
result.trimToSize()
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
|
override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
|
||||||
nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
|
nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
|
||||||
|
|||||||
Reference in New Issue
Block a user