Remove mapping of java.Repeatable to kotlin.Repeatable in JavaAnnotationMapper
The main motivation for this change is that java.lang.annotation.Repeatable has a parameter for the container annotation, which is lost during conversion to kotlin.annotation.Repeatable. To support j.l.a.Repeatable in backend properly, it's absolutely necessary to be able to load the container annotation for any repeatable annotation class, so the original j.l.a.Repeatable needs to be stored in the descriptor and accessible from the backend. Instead of mapping j.l.a.Repeatable -> k.a.Repeatable, add a frontend service PlatformAnnotationFeaturesSupport that will determine if an annotation is repeatable "according to the platform rules", which for JVM means that it's annotated with j.l.a.Repeatable. Some effects of this change include: - Usages of j.l.a.Repeatable are no longer reported as "deprecated", the corresponding test is deleted - Usages of repeatable annotations declared in Java with non-SOURCE retention with LV 1.5 and earlier will now result in a slightly different error (REPEATED_ANNOTATION instead of NON_SOURCE_REPEATED_ANNOTATION) #KT-12794
This commit is contained in:
+32
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.resolve.jvm
|
||||
|
||||
import org.jetbrains.kotlin.config.LanguageFeature
|
||||
import org.jetbrains.kotlin.config.LanguageVersionSettings
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.annotations.KotlinRetention
|
||||
import org.jetbrains.kotlin.load.java.JvmAnnotationNames.REPEATABLE_ANNOTATION
|
||||
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
|
||||
import org.jetbrains.kotlin.resolve.PlatformAnnotationFeaturesSupport
|
||||
import org.jetbrains.kotlin.resolve.descriptorUtil.getAnnotationRetention
|
||||
|
||||
class JvmPlatformAnnotationFeaturesSupport(
|
||||
private val languageVersionSettings: LanguageVersionSettings,
|
||||
) : PlatformAnnotationFeaturesSupport {
|
||||
override fun isRepeatableAnnotationClass(descriptor: ClassDescriptor): Boolean {
|
||||
check(descriptor.kind == ClassKind.ANNOTATION_CLASS) { descriptor }
|
||||
|
||||
// This service only handles annotation classes annotated with java.lang.annotation.Repeatable.
|
||||
if (!descriptor.annotations.hasAnnotation(REPEATABLE_ANNOTATION)) return false
|
||||
|
||||
// Before 1.6, only Java annotations with SOURCE retention could be used as repeatable.
|
||||
// (Note that _Kotlin_ annotations must have been annotated with kotlin.annotation.Repeatable, not j.l.a.Repeatable!)
|
||||
return languageVersionSettings.supportsFeature(LanguageFeature.RepeatableAnnotations) ||
|
||||
descriptor.getAnnotationRetention() == KotlinRetention.SOURCE && descriptor is JavaClassDescriptor
|
||||
}
|
||||
}
|
||||
+1
@@ -115,6 +115,7 @@ object JvmPlatformConfigurator : PlatformConfiguratorBase(
|
||||
container.useImpl<JvmSamConversionOracle>()
|
||||
container.useImpl<JvmAdditionalClassPartsProvider>()
|
||||
container.useImpl<JvmRecordApplicabilityChecker>()
|
||||
container.useImpl<JvmPlatformAnnotationFeaturesSupport>()
|
||||
|
||||
container.useInstance(FunctionWithBigAritySupport.LanguageVersionDependent)
|
||||
container.useInstance(GenericArrayClassLiteralSupport.Enabled)
|
||||
|
||||
Reference in New Issue
Block a user