diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/annotations/KtFe10AnnotationsList.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/annotations/KtFe10AnnotationsList.kt index a2cd8182328..7379f7eee6d 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/annotations/KtFe10AnnotationsList.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/annotations/KtFe10AnnotationsList.kt @@ -37,7 +37,7 @@ internal class KtFe10AnnotationsList private constructor( } } - override fun containsAnnotation(classId: ClassId): Boolean = withValidityAssertion { + override fun hasAnnotation(classId: ClassId): Boolean = withValidityAssertion { return fe10Annotations.hasAnnotation(classId.asSingleFqName()) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt index abb6135301f..04383e82ce1 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt @@ -29,7 +29,7 @@ internal class KtFirAnnotationListForDeclaration private constructor( } - override fun containsAnnotation(classId: ClassId): Boolean = withValidityAssertion { + override fun hasAnnotation(classId: ClassId): Boolean = withValidityAssertion { firSymbol.resolvedAnnotationClassIds.contains(classId) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt index a9e93a5e78e..c8cc8a7818a 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForType.kt @@ -25,7 +25,7 @@ internal class KtFirAnnotationListForType private constructor( get() = withValidityAssertion { coneType.customAnnotations.map { it.toKtAnnotationApplication(useSiteSession) } } - override fun containsAnnotation(classId: ClassId): Boolean = withValidityAssertion { + override fun hasAnnotation(classId: ClassId): Boolean = withValidityAssertion { coneType.customAnnotations.any { it.fullyExpandedClassId(useSiteSession) == classId } } diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/annotations/KtEmptyAnnotationsList.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/annotations/KtEmptyAnnotationsList.kt index d67e5d82eab..769a20e2e10 100644 --- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/annotations/KtEmptyAnnotationsList.kt +++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/annotations/KtEmptyAnnotationsList.kt @@ -15,7 +15,7 @@ class KtEmptyAnnotationsList(override val token: KtLifetimeToken) : KtAnnotation override val annotations: List get() = withValidityAssertion { emptyList() } - override fun containsAnnotation(classId: ClassId): Boolean = withValidityAssertion { false } + override fun hasAnnotation(classId: ClassId): Boolean = withValidityAssertion { false } override fun annotationsByClassId(classId: ClassId): List = withValidityAssertion { emptyList() } diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotated.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotated.kt index d093128b610..002c07e2c47 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotated.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotated.kt @@ -23,12 +23,12 @@ public val KtAnnotated.annotations: List get() = annotationsList.annotations /** - * Checks if entity contains annotation with specified [classId]. + * Checks if entity has annotation with specified [classId]. * - * @see [KtAnnotationsList.containsAnnotation] + * @see [KtAnnotationsList.hasAnnotation] */ -public fun KtAnnotated.containsAnnotation(classId: ClassId): Boolean = - annotationsList.containsAnnotation(classId) +public fun KtAnnotated.hasAnnotation(classId: ClassId): Boolean = + annotationsList.hasAnnotation(classId) /** * A list of annotations applied with specified [classId]. diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotationsList.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotationsList.kt index 052f4faa45e..c25c5d28cc7 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotationsList.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/annotations/KtAnnotationsList.kt @@ -17,7 +17,7 @@ public abstract class KtAnnotationsList : KtLifetimeOwner { /** * A list of annotations applied. * - * To check if annotation is present, please use [containsAnnotation]. + * To check if annotation is present, please use [hasAnnotation]. * * @see KtAnnotationApplication */ @@ -31,12 +31,12 @@ public abstract class KtAnnotationsList : KtLifetimeOwner { * annotationsList.containsAnnotation(classId) == annotationsList.annotations.any { it.classId == classId } * ``` */ - public abstract fun containsAnnotation(classId: ClassId): Boolean + public abstract fun hasAnnotation(classId: ClassId): Boolean /** * A list of annotations applied with specified [classId]. * - * To check if annotation is present, please use [containsAnnotation]. + * To check if annotation is present, please use [hasAnnotation]. * * The semantic is equivalent to * ``` @@ -50,7 +50,7 @@ public abstract class KtAnnotationsList : KtLifetimeOwner { /** * A list of annotations [ClassId]. * - * To check if annotation is present, please use [containsAnnotation]. + * To check if annotation is present, please use [hasAnnotation]. * * The semantic is equivalent to * ```