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

Cleanup: apply "Convert lambda to reference"

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationOwner.kt
+2 -2
View File
@@ -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)
}
core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaClass.kt
+1 -1
View File
@@ -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
core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaConstructor.kt
+1 -1
View File
@@ -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)
}
core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaMethod.kt
+1 -1
View File
@@ -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)
}
core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaTypeParameter.kt
+1 -1
View File
@@ -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
}