Cleanup: apply "Convert lambda to reference"

This commit is contained in:
Mikhail Glukhikh
2017-02-22 16:12:01 +03:00
parent b121bf8802
commit 045a23ae10
82 changed files with 117 additions and 135 deletions
@@ -182,7 +182,7 @@ object JavaAnnotationTargetMapper {
val kotlinTargets = arguments.filterIsInstance<JavaEnumValueAnnotationArgument>()
.flatMap { mapJavaTargetArgumentByName(it.resolve()?.name?.asString()) }
.mapNotNull { builtIns.getAnnotationTargetEnumEntry(it) }
.map { EnumValue(it) }
.map(::EnumValue)
val parameterDescriptor = DescriptorResolverUtils.getAnnotationParameterByName(
JavaAnnotationMapper.TARGET_ANNOTATION_ALLOWED_TARGETS, builtIns.targetAnnotation
)
@@ -199,7 +199,7 @@ object JavaAnnotationTargetMapper {
// Map argument: java.lang.annotation.Retention -> kotlin.annotation.annotation
return (element as? JavaEnumValueAnnotationArgument)?.let {
retentionNameList[it.resolve()?.name?.asString()]?.let {
(builtIns.getAnnotationRetentionEnumEntry(it) as? ClassDescriptor)?.let { EnumValue(it) }
(builtIns.getAnnotationRetentionEnumEntry(it) as? ClassDescriptor)?.let(::EnumValue)
}
}
}
@@ -67,7 +67,7 @@ object BuiltinSpecialProperties {
.groupBy({ it.second }, { it.first })
private val SPECIAL_FQ_NAMES = PROPERTY_FQ_NAME_TO_JVM_GETTER_NAME_MAP.keys
internal val SPECIAL_SHORT_NAMES = SPECIAL_FQ_NAMES.map { it.shortName() }.toSet()
internal val SPECIAL_SHORT_NAMES = SPECIAL_FQ_NAMES.map(FqName::shortName).toSet()
fun hasBuiltinSpecialPropertyFqName(callableMemberDescriptor: CallableMemberDescriptor): Boolean {
if (callableMemberDescriptor.name !in SPECIAL_SHORT_NAMES) return false
@@ -34,9 +34,9 @@ interface ReflectJavaAnnotationOwner : JavaAnnotationOwner {
}
fun Array<Annotation>.getAnnotations(): List<ReflectJavaAnnotation> {
return map { ReflectJavaAnnotation(it) }
return map(::ReflectJavaAnnotation)
}
fun Array<Annotation>.findAnnotation(fqName: FqName): ReflectJavaAnnotation? {
return firstOrNull { it.annotationClass.java.classId.asSingleFqName() == fqName }?.let { ReflectJavaAnnotation(it) }
return firstOrNull { it.annotationClass.java.classId.asSingleFqName() == fqName }?.let(::ReflectJavaAnnotation)
}
@@ -97,7 +97,7 @@ class ReflectJavaClass(
get() = Name.identifier(klass.simpleName)
override val typeParameters: List<ReflectJavaTypeParameter>
get() = klass.typeParameters.map { ReflectJavaTypeParameter(it) }
get() = klass.typeParameters.map(::ReflectJavaTypeParameter)
override val isInterface: Boolean
get() = klass.isInterface
@@ -46,5 +46,5 @@ class ReflectJavaConstructor(override val member: Constructor<*>) : ReflectJavaM
}
override val typeParameters: List<ReflectJavaTypeParameter>
get() = member.typeParameters.map { ReflectJavaTypeParameter(it) }
get() = member.typeParameters.map(::ReflectJavaTypeParameter)
}
@@ -31,5 +31,5 @@ class ReflectJavaMethod(override val member: Method) : ReflectJavaMember(), Java
get() = member.defaultValue != null
override val typeParameters: List<ReflectJavaTypeParameter>
get() = member.typeParameters.map { ReflectJavaTypeParameter(it) }
get() = member.typeParameters.map(::ReflectJavaTypeParameter)
}
@@ -26,7 +26,7 @@ class ReflectJavaTypeParameter(
) : ReflectJavaElement(), JavaTypeParameter, ReflectJavaAnnotationOwner {
override val upperBounds: List<ReflectJavaClassifierType>
get() {
val bounds = typeVariable.bounds.map { bound -> ReflectJavaClassifierType(bound) }
val bounds = typeVariable.bounds.map(::ReflectJavaClassifierType)
if (bounds.singleOrNull()?.reflectType == Any::class.java) return emptyList()
return bounds
}
@@ -102,7 +102,7 @@ fun KotlinTypeChecker.equalTypesOrNulls(type1: KotlinType?, type2: KotlinType?):
fun KotlinType.containsError() = ErrorUtils.containsErrorType(this)
fun List<KotlinType>.defaultProjections(): List<TypeProjection> = map { TypeProjectionImpl(it) }
fun List<KotlinType>.defaultProjections(): List<TypeProjection> = map(::TypeProjectionImpl)
fun KotlinType.isDefaultBound(): Boolean = KotlinBuiltIns.isDefaultBound(getSupertypeRepresentative())