diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/annotation/AnnotatedWithOnlyTargetedAnnotations.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/annotation/AnnotatedWithOnlyTargetedAnnotations.kt index 443be823075..5df9ad9a035 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/annotation/AnnotatedWithOnlyTargetedAnnotations.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/annotation/AnnotatedWithOnlyTargetedAnnotations.kt @@ -36,8 +36,6 @@ class AnnotatedWithOnlyTargetedAnnotations(original: Annotated) : Annotated { override fun findAnnotation(fqName: FqName) = null - override fun findExternalAnnotation(fqName: FqName) = null - override fun getUseSiteTargetedAnnotations() = getAdditionalTargetedAnnotations() override fun getAllAnnotations() = getAdditionalTargetedAnnotations() @@ -48,4 +46,4 @@ class AnnotatedWithOnlyTargetedAnnotations(original: Annotated) : Annotated { } } -class AnnotatedSimple(annotations: Annotations) : AnnotatedImpl(annotations) \ No newline at end of file +class AnnotatedSimple(annotations: Annotations) : AnnotatedImpl(annotations) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt index 023006551e7..ad59d3fd215 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt @@ -78,8 +78,6 @@ class LazyAnnotations( return null } - override fun findExternalAnnotation(fqName: FqName) = null - override fun getUseSiteTargetedAnnotations(): List { return annotationEntries .mapNotNull { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt index 56a2e160970..cd14c87a112 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt @@ -194,8 +194,6 @@ private class EnhancedTypeAnnotations(private val fqNameToMatch: FqName) : Annot else -> null } - override fun findExternalAnnotation(fqName: FqName) = null - override fun getAllAnnotations() = this.map { AnnotationWithTarget(it, null) } override fun getUseSiteTargetedAnnotations() = emptyList() diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt index 97c1f647eaa..6531072ee45 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt @@ -32,7 +32,7 @@ interface Annotations : Iterable { fun hasAnnotation(fqName: FqName) = findAnnotation(fqName) != null - fun findExternalAnnotation(fqName: FqName): AnnotationDescriptor? + fun findExternalAnnotation(fqName: FqName): AnnotationDescriptor? = null fun getUseSiteTargetedAnnotations(): List @@ -45,8 +45,6 @@ interface Annotations : Iterable { override fun findAnnotation(fqName: FqName) = null - override fun findExternalAnnotation(fqName: FqName) = null - override fun getUseSiteTargetedAnnotations() = emptyList() override fun getAllAnnotations() = emptyList() diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt index ee969875c3e..58d3630c19c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt @@ -53,8 +53,6 @@ class AnnotationsImpl : Annotations { override fun getAllAnnotations() = targetedAnnotations - override fun findExternalAnnotation(fqName: FqName) = null - override fun iterator() = annotations.iterator() override fun toString() = annotations.toString() diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt index 08b9beffacc..2cb440b09b2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/annotationsForResolve.kt @@ -66,8 +66,6 @@ private class AnnotationsWithOnly(val presentAnnotation: FqName): Annotations { override fun findAnnotation(fqName: FqName): AnnotationDescriptor? = null - override fun findExternalAnnotation(fqName: FqName): AnnotationDescriptor? = null - override fun getUseSiteTargetedAnnotations(): List = emptyList() override fun getAllAnnotations(): List = emptyList() diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt index d633bde7857..3ff39885ba3 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt @@ -36,8 +36,6 @@ class DeserializedAnnotations( override fun findAnnotation(fqName: FqName) = annotations.firstOrNull { annotation -> annotation.annotationClass?.fqNameUnsafe == fqName.toUnsafe() } - override fun findExternalAnnotation(fqName: FqName) = null - override fun getUseSiteTargetedAnnotations(): List = emptyList() override fun getAllAnnotations(): List = annotations.map { AnnotationWithTarget(it, null) } @@ -58,8 +56,6 @@ class DeserializedAnnotationsWithPossibleTargets( target == null && annotation.annotationClass?.fqNameUnsafe == fqName.toUnsafe() }?.annotation - override fun findExternalAnnotation(fqName: FqName) = null - override fun getUseSiteTargetedAnnotations(): List = annotations.filter { it.target != null } override fun getAllAnnotations(): List = annotations