From 7d85424f6a727996384844461b3e1ad3afeb47e2 Mon Sep 17 00:00:00 2001 From: Alexey Belkov Date: Fri, 10 Jun 2022 21:44:14 +0300 Subject: [PATCH] [kotlin] Simplify KtTypeReference.isAnnotatedDeep ^KTIJ-21956 GitOrigin-RevId: cdd4050718adfb4c26473110cf96458ae0b889b7 --- .../src/org/jetbrains/kotlin/idea/intentions/Utils.kt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt index 162bf2cd2318..9ffa1946aba4 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt @@ -425,14 +425,9 @@ fun ClassDescriptor.isRange(): Boolean { } fun KtTypeReference.isAnnotatedDeep(): Boolean { - fun List.areAnnotatedDeep(): Boolean { - for (type in this) { - if (type.annotationEntries.isNotEmpty()) return true - if (type.typeArguments().mapNotNull { it.typeReference }.areAnnotatedDeep()) return true - } - return false - } - return listOf(this).areAnnotatedDeep() + if (annotationEntries.isNotEmpty()) return true + if (typeArguments().any { it.typeReference?.isAnnotatedDeep() == true }) return true + return false } fun KtTypeReference?.typeArguments(): List {