JVM: remove diagnostics related to JVM target 1.6

This commit is contained in:
Alexander Udalov
2023-05-12 10:21:19 +02:00
committed by Space Team
parent e4e1bcefbd
commit 75197d1b86
16 changed files with 25 additions and 260 deletions
@@ -4620,13 +4620,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_IN_JVM6_TARGET) { firDiagnostic ->
JvmDefaultInJvm6TargetImpl(
firDiagnostic.a,
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_IN_DECLARATION) { firDiagnostic ->
JvmDefaultInDeclarationImpl(
firDiagnostic.a,
@@ -4676,12 +4669,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.REPEATED_ANNOTATION_TARGET6) { firDiagnostic ->
RepeatedAnnotationTarget6Impl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.REPEATED_ANNOTATION_WITH_CONTAINER) { firDiagnostic ->
RepeatedAnnotationWithContainerImpl(
firDiagnostic.a,
@@ -4797,30 +4784,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET.errorFactory) { firDiagnostic ->
DefaultMethodCallFromJava6TargetErrorImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET.warningFactory) { firDiagnostic ->
DefaultMethodCallFromJava6TargetWarningImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET.errorFactory) { firDiagnostic ->
InterfaceStaticMethodCallFromJava6TargetErrorImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET.warningFactory) { firDiagnostic ->
InterfaceStaticMethodCallFromJava6TargetWarningImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC) { firDiagnostic ->
SubclassCantCallCompanionProtectedNonStaticImpl(
firDiagnostic as KtPsiDiagnostic,
@@ -3216,11 +3216,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = IllegalJavaLangRecordSupertype::class
}
abstract class JvmDefaultInJvm6Target : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = JvmDefaultInJvm6Target::class
abstract val annotation: String
}
abstract class JvmDefaultInDeclaration : KtFirDiagnostic<KtElement>() {
override val diagnosticClass get() = JvmDefaultInDeclaration::class
abstract val annotation: String
@@ -3254,10 +3249,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = NonSourceRepeatedAnnotation::class
}
abstract class RepeatedAnnotationTarget6 : KtFirDiagnostic<KtAnnotationEntry>() {
override val diagnosticClass get() = RepeatedAnnotationTarget6::class
}
abstract class RepeatedAnnotationWithContainer : KtFirDiagnostic<KtAnnotationEntry>() {
override val diagnosticClass get() = RepeatedAnnotationWithContainer::class
abstract val name: ClassId
@@ -3343,22 +3334,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = JvmSyntheticOnDelegate::class
}
abstract class DefaultMethodCallFromJava6TargetError : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = DefaultMethodCallFromJava6TargetError::class
}
abstract class DefaultMethodCallFromJava6TargetWarning : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = DefaultMethodCallFromJava6TargetWarning::class
}
abstract class InterfaceStaticMethodCallFromJava6TargetError : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = InterfaceStaticMethodCallFromJava6TargetError::class
}
abstract class InterfaceStaticMethodCallFromJava6TargetWarning : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = InterfaceStaticMethodCallFromJava6TargetWarning::class
}
abstract class SubclassCantCallCompanionProtectedNonStatic : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = SubclassCantCallCompanionProtectedNonStatic::class
}
@@ -3887,12 +3887,6 @@ internal class IllegalJavaLangRecordSupertypeImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.IllegalJavaLangRecordSupertype(), KtAbstractFirDiagnostic<PsiElement>
internal class JvmDefaultInJvm6TargetImpl(
override val annotation: String,
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmDefaultInJvm6Target(), KtAbstractFirDiagnostic<PsiElement>
internal class JvmDefaultInDeclarationImpl(
override val annotation: String,
override val firDiagnostic: KtPsiDiagnostic,
@@ -3934,11 +3928,6 @@ internal class NonSourceRepeatedAnnotationImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.NonSourceRepeatedAnnotation(), KtAbstractFirDiagnostic<KtAnnotationEntry>
internal class RepeatedAnnotationTarget6Impl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.RepeatedAnnotationTarget6(), KtAbstractFirDiagnostic<KtAnnotationEntry>
internal class RepeatedAnnotationWithContainerImpl(
override val name: ClassId,
override val explicitContainerName: ClassId,
@@ -4039,26 +4028,6 @@ internal class JvmSyntheticOnDelegateImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmSyntheticOnDelegate(), KtAbstractFirDiagnostic<KtAnnotationEntry>
internal class DefaultMethodCallFromJava6TargetErrorImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.DefaultMethodCallFromJava6TargetError(), KtAbstractFirDiagnostic<PsiElement>
internal class DefaultMethodCallFromJava6TargetWarningImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.DefaultMethodCallFromJava6TargetWarning(), KtAbstractFirDiagnostic<PsiElement>
internal class InterfaceStaticMethodCallFromJava6TargetErrorImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.InterfaceStaticMethodCallFromJava6TargetError(), KtAbstractFirDiagnostic<PsiElement>
internal class InterfaceStaticMethodCallFromJava6TargetWarningImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.InterfaceStaticMethodCallFromJava6TargetWarning(), KtAbstractFirDiagnostic<PsiElement>
internal class SubclassCantCallCompanionProtectedNonStaticImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,