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/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