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

Minor, use stdlib instead of ifEmpty

Browse Source
This commit is contained in:
Alexander Udalov
2018-03-01 18:49:36 +01:00
parent a5a69c5099
commit 5ed5ac8291
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
+3 -4
View File
@@ -17,10 +17,9 @@
package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.metadata.ProtoBuf
import org.jetbrains.kotlin.utils.ifEmpty
fun ProtoBuf.Class.supertypes(typeTable: TypeTable): List<ProtoBuf.Type> {
return supertypeList.ifEmpty { supertypeIdList.map { typeTable[it] } }
return supertypeList.takeIf(Collection<*>::isNotEmpty) ?: supertypeIdList.map { typeTable[it] }
}
fun ProtoBuf.Type.Argument.type(typeTable: TypeTable): ProtoBuf.Type? {
@@ -40,7 +39,7 @@ fun ProtoBuf.Type.flexibleUpperBound(typeTable: TypeTable): ProtoBuf.Type? {
}
fun ProtoBuf.TypeParameter.upperBounds(typeTable: TypeTable): List<ProtoBuf.Type> {
return upperBoundList.ifEmpty { upperBoundIdList.map { typeTable[it] } }
return upperBoundList.takeIf(Collection<*>::isNotEmpty) ?: upperBoundIdList.map { typeTable[it] }
}
fun ProtoBuf.Function.returnType(typeTable: TypeTable): ProtoBuf.Type {
@@ -102,4 +101,4 @@ fun ProtoBuf.TypeAlias.underlyingType(typeTable: TypeTable): ProtoBuf.Type =
if (hasUnderlyingTypeId()) typeTable[underlyingTypeId] else underlyingType
fun ProtoBuf.TypeAlias.expandedType(typeTable: TypeTable): ProtoBuf.Type =
if (hasExpandedTypeId()) typeTable[expandedTypeId] else expandedType
if (hasExpandedTypeId()) typeTable[expandedTypeId] else expandedType