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

AnnotationTarget.PACKAGE was dropped

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-02 18:09:43 +03:00
parent c836060f3a
commit 699f1e0a70
13 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java
-1
View File
@@ -187,7 +187,6 @@ public abstract class AnnotationCodegen {
new EnumMap<KotlinTarget, ElementType>(KotlinTarget.class);
static {
annotationTargetMap.put(KotlinTarget.PACKAGE, ElementType.PACKAGE);
annotationTargetMap.put(KotlinTarget.CLASSIFIER, ElementType.TYPE);
annotationTargetMap.put(KotlinTarget.ANNOTATION_CLASS, ElementType.ANNOTATION_TYPE);
annotationTargetMap.put(KotlinTarget.CONSTRUCTOR, ElementType.CONSTRUCTOR);
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt
-2
View File
@@ -165,7 +165,6 @@ public class AnnotationChecker(private val additionalCheckers: Iterable<Addition
TargetLists.T_TOP_LEVEL_FUNCTION
}
is JetPropertyAccessor -> if (annotated.isGetter) TargetLists.T_PROPERTY_GETTER else TargetLists.T_PROPERTY_SETTER
is JetPackageDirective -> TargetLists.T_PACKAGE
is JetTypeReference -> TargetLists.T_TYPE_REFERENCE
is JetFile -> TargetLists.T_FILE
is JetTypeParameter -> TargetLists.T_TYPE_PARAMETER
@@ -205,7 +204,6 @@ public class AnnotationChecker(private val additionalCheckers: Iterable<Addition
}
val T_FILE = targetList(FILE)
val T_PACKAGE = targetList(PACKAGE)
val T_CONSTRUCTOR = targetList(CONSTRUCTOR)
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+1 -1
View File
@@ -168,7 +168,7 @@ public object ModifierCheckerCore {
val actualParents: List<KotlinTarget> = when (parentDescriptor) {
is ClassDescriptor -> KotlinTarget.classActualTargets(parentDescriptor)
is FunctionDescriptor -> listOf(FUNCTION)
else -> listOf(PACKAGE)
else -> listOf(FILE)
}
val possibleParents = possibleParentTargetMap[modifier] ?: return true
if (possibleParents == KotlinTarget.ALL_TARGET_SET) return true
compiler/testData/compileJavaAgainstKotlin/targets/package-info.java
Vendored
-5
View File
@@ -1,5 +0,0 @@
@pck package test;
@pck class My {
}
compiler/testData/compileJavaAgainstKotlin/targets/package-info.javaerr.txt
Vendored
-2
View File
@@ -1,2 +0,0 @@
package-info.java:3:1:compiler.err.annotation.type.not.applicable
compiler/testData/compileJavaAgainstKotlin/targets/package-info.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
package test
target(AnnotationTarget.PACKAGE)
annotation class pck
compiler/testData/compileJavaAgainstKotlin/targets/package-info.txt
Vendored
-8
View File
@@ -1,8 +0,0 @@
package test
test.pck() public/*package*/ interface `package-info` {
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.PACKAGE}) kotlin.annotation.annotation() internal final class pck : kotlin.Annotation {
public constructor pck()
}
compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
<!UNRESOLVED_REFERENCE!>myAnnotation<!> <!WRONG_MODIFIER_TARGET!>public<!> package illegal_modifiers
<!UNRESOLVED_REFERENCE, WRONG_ANNOTATION_TARGET!>myAnnotation<!> <!WRONG_MODIFIER_TARGET!>public<!> package illegal_modifiers
abstract class A() {
<!INCOMPATIBLE_MODIFIERS!>abstract<!> <!INCOMPATIBLE_MODIFIERS!>final<!> fun f()
compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ public open class AnnotationTargets {
public constructor multiple()
}
kotlin.annotation.target(allowedTargets = {AnnotationTarget.PACKAGE}) public final class packag : kotlin.Annotation {
kotlin.annotation.target(allowedTargets = {}) public final class packag : kotlin.Annotation {
public constructor packag()
}
compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
-6
View File
@@ -622,12 +622,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
doTest(fileName);
}
@TestMetadata("package-info.kt")
public void testPackage_info() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/package-info.kt");
doTest(fileName);
}
@TestMetadata("parameter.kt")
public void testParameter() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt");
core/builtins/src/kotlin/annotation/Annotations.kt
-2
View File
@@ -20,8 +20,6 @@ package kotlin.annotation
* Contains the list of code elements which are the possible annotation targets
*/
public enum class AnnotationTarget {
/** Package directive */
PACKAGE,
/** Class, interface or object, annotation class is also included */
CLASSIFIER,
/** Annotation class only */
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt
+1 -1
View File
@@ -175,7 +175,7 @@ class JavaTargetAnnotationDescriptor(
}
public object JavaAnnotationTargetMapper {
private val targetNameLists = mapOf("PACKAGE" to EnumSet.of(KotlinTarget.PACKAGE),
private val targetNameLists = mapOf("PACKAGE" to EnumSet.noneOf(KotlinTarget::class.java),
"TYPE" to EnumSet.of(KotlinTarget.CLASSIFIER),
"ANNOTATION_TYPE" to EnumSet.of(KotlinTarget.ANNOTATION_CLASS),
"TYPE_PARAMETER" to EnumSet.of(KotlinTarget.TYPE_PARAMETER),
core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/KotlinTarget.kt
-1
View File
@@ -24,7 +24,6 @@ import java.util.*
// NOTE: this enum must have the same entries with kotlin.annotation.AnnotationTarget,
// and may also have some additional entries
public enum class KotlinTarget(val description: String, val isDefault: Boolean = true) {
PACKAGE("package"),
CLASSIFIER("classifier"), // includes CLASS, OBJECT, INTERFACE, *_CLASS but not ENUM_ENTRY
ANNOTATION_CLASS("annotation class"),
TYPE_PARAMETER("type parameter", false),