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

Java annotation with target "TYPE" is now applicable to Kotlin targets "CLASSIFIER" and "FILE"

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-02 18:14:37 +03:00
parent 699f1e0a70
commit 4e3bd10cd3
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/options/targets/java.kt
Vendored
+1
View File
@@ -55,6 +55,7 @@ public class AnnotationTargets {
// FILE: test/AnnotationTargets.kt // FILE: test/AnnotationTargets.kt
@file:AnnotationTargets.type
package test package test
import test.AnnotationTargets.* import test.AnnotationTargets.*
compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
Vendored
+1 -1
View File
@@ -64,7 +64,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String 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 constructor type()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ public open class AnnotationTargets {
public constructor parameter() 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() public constructor type()
} }
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt
+1 -1
View File
@@ -176,7 +176,7 @@ class JavaTargetAnnotationDescriptor(
public object JavaAnnotationTargetMapper { public object JavaAnnotationTargetMapper {
private val targetNameLists = mapOf("PACKAGE" to EnumSet.noneOf(KotlinTarget::class.java), 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), "ANNOTATION_TYPE" to EnumSet.of(KotlinTarget.ANNOTATION_CLASS),
"TYPE_PARAMETER" to EnumSet.of(KotlinTarget.TYPE_PARAMETER), "TYPE_PARAMETER" to EnumSet.of(KotlinTarget.TYPE_PARAMETER),
"FIELD" to EnumSet.of(KotlinTarget.FIELD), "FIELD" to EnumSet.of(KotlinTarget.FIELD),