JvmDefault: remove diagnostics related to @JvmDefault

#KT-54746
This commit is contained in:
Alexander Udalov
2023-04-22 00:13:14 +02:00
committed by Space Team
parent 3120a35a88
commit e0b5ae7781
11 changed files with 42 additions and 216 deletions
@@ -4620,12 +4620,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_NOT_IN_INTERFACE) { firDiagnostic ->
JvmDefaultNotInInterfaceImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_IN_JVM6_TARGET) { firDiagnostic ->
JvmDefaultInJvm6TargetImpl(
firDiagnostic.a,
@@ -4633,12 +4627,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_REQUIRED_FOR_OVERRIDE) { firDiagnostic ->
JvmDefaultRequiredForOverrideImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.JVM_DEFAULT_IN_DECLARATION) { firDiagnostic ->
JvmDefaultInDeclarationImpl(
firDiagnostic.a,
@@ -4658,12 +4646,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirJvmErrors.NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT) { firDiagnostic ->
NonJvmDefaultOverridesJavaDefaultImpl(
firDiagnostic as KtPsiDiagnostic,
token,
)
}
add(FirJvmErrors.EXTERNAL_DECLARATION_CANNOT_BE_ABSTRACT) { firDiagnostic ->
ExternalDeclarationCannotBeAbstractImpl(
firDiagnostic as KtPsiDiagnostic,
@@ -3216,19 +3216,11 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = IllegalJavaLangRecordSupertype::class
}
abstract class JvmDefaultNotInInterface : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = JvmDefaultNotInInterface::class
}
abstract class JvmDefaultInJvm6Target : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = JvmDefaultInJvm6Target::class
abstract val annotation: String
}
abstract class JvmDefaultRequiredForOverride : KtFirDiagnostic<KtDeclaration>() {
override val diagnosticClass get() = JvmDefaultRequiredForOverride::class
}
abstract class JvmDefaultInDeclaration : KtFirDiagnostic<KtElement>() {
override val diagnosticClass get() = JvmDefaultInDeclaration::class
abstract val annotation: String
@@ -3242,10 +3234,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = JvmDefaultWithCompatibilityNotOnInterface::class
}
abstract class NonJvmDefaultOverridesJavaDefault : KtFirDiagnostic<KtDeclaration>() {
override val diagnosticClass get() = NonJvmDefaultOverridesJavaDefault::class
}
abstract class ExternalDeclarationCannotBeAbstract : KtFirDiagnostic<KtDeclaration>() {
override val diagnosticClass get() = ExternalDeclarationCannotBeAbstract::class
}
@@ -3887,22 +3887,12 @@ internal class IllegalJavaLangRecordSupertypeImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.IllegalJavaLangRecordSupertype(), KtAbstractFirDiagnostic<PsiElement>
internal class JvmDefaultNotInInterfaceImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmDefaultNotInInterface(), KtAbstractFirDiagnostic<PsiElement>
internal class JvmDefaultInJvm6TargetImpl(
override val annotation: String,
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmDefaultInJvm6Target(), KtAbstractFirDiagnostic<PsiElement>
internal class JvmDefaultRequiredForOverrideImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmDefaultRequiredForOverride(), KtAbstractFirDiagnostic<KtDeclaration>
internal class JvmDefaultInDeclarationImpl(
override val annotation: String,
override val firDiagnostic: KtPsiDiagnostic,
@@ -3919,11 +3909,6 @@ internal class JvmDefaultWithCompatibilityNotOnInterfaceImpl(
override val token: KtLifetimeToken,
) : KtFirDiagnostic.JvmDefaultWithCompatibilityNotOnInterface(), KtAbstractFirDiagnostic<KtElement>
internal class NonJvmDefaultOverridesJavaDefaultImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,
) : KtFirDiagnostic.NonJvmDefaultOverridesJavaDefault(), KtAbstractFirDiagnostic<KtDeclaration>
internal class ExternalDeclarationCannotBeAbstractImpl(
override val firDiagnostic: KtPsiDiagnostic,
override val token: KtLifetimeToken,