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

Minor, reformat Annotations.kt file

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2019-09-26 14:31:14 +03:00
parent 2ff36c808e
commit ba6648d535
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
+16 -16
View File
@@ -50,32 +50,32 @@ interface Annotations : Iterable<AnnotationDescriptor> {
} }
class FilteredAnnotations( class FilteredAnnotations(
private val delegate: Annotations, private val delegate: Annotations,
private val fqNameFilter: (FqName) -> Boolean private val fqNameFilter: (FqName) -> Boolean
) : Annotations { ) : Annotations {
override fun hasAnnotation(fqName: FqName) = override fun hasAnnotation(fqName: FqName) =
if (fqNameFilter(fqName)) delegate.hasAnnotation(fqName) if (fqNameFilter(fqName)) delegate.hasAnnotation(fqName)
else false else false
override fun findAnnotation(fqName: FqName) = override fun findAnnotation(fqName: FqName) =
if (fqNameFilter(fqName)) delegate.findAnnotation(fqName) if (fqNameFilter(fqName)) delegate.findAnnotation(fqName)
else null else null
override fun iterator() = delegate.filter(this::shouldBeReturned).iterator() override fun iterator() = delegate.filter(this::shouldBeReturned).iterator()
override fun isEmpty() = delegate.any(this::shouldBeReturned) override fun isEmpty() = delegate.any(this::shouldBeReturned)
private fun shouldBeReturned(annotation: AnnotationDescriptor): Boolean = private fun shouldBeReturned(annotation: AnnotationDescriptor): Boolean =
annotation.fqName.let { fqName -> annotation.fqName.let { fqName ->
fqName != null && fqNameFilter(fqName) fqName != null && fqNameFilter(fqName)
} }
} }
class CompositeAnnotations( class CompositeAnnotations(
private val delegates: List<Annotations> private val delegates: List<Annotations>
) : Annotations { ) : Annotations {
constructor(vararg delegates: Annotations): this(delegates.toList()) constructor(vararg delegates: Annotations) : this(delegates.toList())
override fun isEmpty() = delegates.all { it.isEmpty() } override fun isEmpty() = delegates.all { it.isEmpty() }
@@ -90,8 +90,8 @@ class CompositeAnnotations(
} }
fun composeAnnotations(first: Annotations, second: Annotations) = fun composeAnnotations(first: Annotations, second: Annotations) =
when { when {
first.isEmpty() -> second first.isEmpty() -> second
second.isEmpty() -> first second.isEmpty() -> first
else -> CompositeAnnotations(first, second) else -> CompositeAnnotations(first, second)
} }