diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/java.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.kt index 41081380c0d..9a52adcb200 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.kt @@ -55,6 +55,7 @@ public class AnnotationTargets { // FILE: test/AnnotationTargets.kt +@file:AnnotationTargets.type package test import test.AnnotationTargets.* diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt index 2ecbd1c3655..c8b8fadc1b2 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt @@ -64,7 +64,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) public final class type : kotlin.Annotation { + kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { public constructor type() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt index 2e414d17f5e..16fe37893ee 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt @@ -39,7 +39,7 @@ public open class AnnotationTargets { public constructor parameter() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) public final class type : kotlin.Annotation { + kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { public constructor type() } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt index e62003a4caf..7f5fa70b7a3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt @@ -176,7 +176,7 @@ class JavaTargetAnnotationDescriptor( public object JavaAnnotationTargetMapper { private val targetNameLists = mapOf("PACKAGE" to EnumSet.noneOf(KotlinTarget::class.java), - "TYPE" to EnumSet.of(KotlinTarget.CLASSIFIER), + "TYPE" to EnumSet.of(KotlinTarget.CLASSIFIER, KotlinTarget.FILE), "ANNOTATION_TYPE" to EnumSet.of(KotlinTarget.ANNOTATION_CLASS), "TYPE_PARAMETER" to EnumSet.of(KotlinTarget.TYPE_PARAMETER), "FIELD" to EnumSet.of(KotlinTarget.FIELD),