From 108df38255a3987de78d58871c83b3a51ab0dcc4 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Thu, 9 Sep 2021 20:15:42 +0300 Subject: [PATCH] [FIR] Regenerate code --- .../diagnostics/KtFirDataClassConverters.kt | 96 +++++++-------- .../api/fir/diagnostics/KtFirDiagnostics.kt | 64 +++++----- .../fir/diagnostics/KtFirDiagnosticsImpl.kt | 112 +++++++++--------- 3 files changed, 136 insertions(+), 136 deletions(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt index 9eb392df8af..bb879acd875 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -3474,6 +3474,54 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert token, ) } + add(FirJvmErrors.OVERRIDE_CANNOT_BE_STATIC) { firDiagnostic -> + OverrideCannotBeStaticImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION) { firDiagnostic -> + JvmStaticNotInObjectOrClassCompanionImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION) { firDiagnostic -> + JvmStaticNotInObjectOrCompanionImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.JVM_STATIC_ON_NON_PUBLIC_MEMBER) { firDiagnostic -> + JvmStaticOnNonPublicMemberImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.JVM_STATIC_ON_CONST_OR_JVM_FIELD) { firDiagnostic -> + JvmStaticOnConstOrJvmFieldImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.JVM_STATIC_ON_EXTERNAL_IN_INTERFACE) { firDiagnostic -> + JvmStaticOnExternalInInterfaceImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.INAPPLICABLE_JVM_NAME) { firDiagnostic -> + InapplicableJvmNameImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } + add(FirJvmErrors.ILLEGAL_JVM_NAME) { firDiagnostic -> + IllegalJvmNameImpl( + firDiagnostic as FirPsiDiagnostic, + token, + ) + } add(FirJvmErrors.JAVA_TYPE_MISMATCH) { firDiagnostic -> JavaTypeMismatchImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), @@ -3664,52 +3712,4 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert token, ) } - add(FirJvmErrors.OVERRIDE_CANNOT_BE_STATIC) { firDiagnostic -> - OverrideCannotBeStaticImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION) { firDiagnostic -> - JvmStaticNotInObjectOrClassCompanionImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION) { firDiagnostic -> - JvmStaticNotInObjectOrCompanionImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.JVM_STATIC_ON_NON_PUBLIC_MEMBER) { firDiagnostic -> - JvmStaticOnNonPublicMemberImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.JVM_STATIC_ON_CONST_OR_JVM_FIELD) { firDiagnostic -> - JvmStaticOnConstOrJvmFieldImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.JVM_STATIC_ON_EXTERNAL_IN_INTERFACE) { firDiagnostic -> - JvmStaticOnExternalInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.INAPPLICABLE_JVM_NAME) { firDiagnostic -> - InapplicableJvmNameImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } - add(FirJvmErrors.ILLEGAL_JVM_NAME) { firDiagnostic -> - IllegalJvmNameImpl( - firDiagnostic as FirPsiDiagnostic, - token, - ) - } } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt index fd59cf4dad5..99237e86e6d 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt @@ -2422,6 +2422,38 @@ sealed class KtFirDiagnostic : KtDiagnosticWithPsi { override val diagnosticClass get() = ConflictingJvmDeclarations::class } + abstract class OverrideCannotBeStatic : KtFirDiagnostic() { + override val diagnosticClass get() = OverrideCannotBeStatic::class + } + + abstract class JvmStaticNotInObjectOrClassCompanion : KtFirDiagnostic() { + override val diagnosticClass get() = JvmStaticNotInObjectOrClassCompanion::class + } + + abstract class JvmStaticNotInObjectOrCompanion : KtFirDiagnostic() { + override val diagnosticClass get() = JvmStaticNotInObjectOrCompanion::class + } + + abstract class JvmStaticOnNonPublicMember : KtFirDiagnostic() { + override val diagnosticClass get() = JvmStaticOnNonPublicMember::class + } + + abstract class JvmStaticOnConstOrJvmField : KtFirDiagnostic() { + override val diagnosticClass get() = JvmStaticOnConstOrJvmField::class + } + + abstract class JvmStaticOnExternalInInterface : KtFirDiagnostic() { + override val diagnosticClass get() = JvmStaticOnExternalInInterface::class + } + + abstract class InapplicableJvmName : KtFirDiagnostic() { + override val diagnosticClass get() = InapplicableJvmName::class + } + + abstract class IllegalJvmName : KtFirDiagnostic() { + override val diagnosticClass get() = IllegalJvmName::class + } + abstract class JavaTypeMismatch : KtFirDiagnostic() { override val diagnosticClass get() = JavaTypeMismatch::class abstract val expectedType: KtType @@ -2550,36 +2582,4 @@ sealed class KtFirDiagnostic : KtDiagnosticWithPsi { override val diagnosticClass get() = IllegalJavaLangRecordSupertype::class } - abstract class OverrideCannotBeStatic : KtFirDiagnostic() { - override val diagnosticClass get() = OverrideCannotBeStatic::class - } - - abstract class JvmStaticNotInObjectOrClassCompanion : KtFirDiagnostic() { - override val diagnosticClass get() = JvmStaticNotInObjectOrClassCompanion::class - } - - abstract class JvmStaticNotInObjectOrCompanion : KtFirDiagnostic() { - override val diagnosticClass get() = JvmStaticNotInObjectOrCompanion::class - } - - abstract class JvmStaticOnNonPublicMember : KtFirDiagnostic() { - override val diagnosticClass get() = JvmStaticOnNonPublicMember::class - } - - abstract class JvmStaticOnConstOrJvmField : KtFirDiagnostic() { - override val diagnosticClass get() = JvmStaticOnConstOrJvmField::class - } - - abstract class JvmStaticOnExternalInInterface : KtFirDiagnostic() { - override val diagnosticClass get() = JvmStaticOnExternalInInterface::class - } - - abstract class InapplicableJvmName : KtFirDiagnostic() { - override val diagnosticClass get() = InapplicableJvmName::class - } - - abstract class IllegalJvmName : KtFirDiagnostic() { - override val diagnosticClass get() = IllegalJvmName::class - } - } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt index 6b4b2e2c9c4..19091d41a85 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt @@ -3917,6 +3917,62 @@ internal class ConflictingJvmDeclarationsImpl( override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) } +internal class OverrideCannotBeStaticImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.OverrideCannotBeStatic(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class JvmStaticNotInObjectOrClassCompanionImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.JvmStaticNotInObjectOrClassCompanion(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class JvmStaticNotInObjectOrCompanionImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.JvmStaticNotInObjectOrCompanion(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class JvmStaticOnNonPublicMemberImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.JvmStaticOnNonPublicMember(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class JvmStaticOnConstOrJvmFieldImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.JvmStaticOnConstOrJvmField(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class JvmStaticOnExternalInInterfaceImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.JvmStaticOnExternalInInterface(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class InapplicableJvmNameImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.InapplicableJvmName(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + +internal class IllegalJvmNameImpl( + firDiagnostic: FirPsiDiagnostic, + override val token: ValidityToken, +) : KtFirDiagnostic.IllegalJvmName(), KtAbstractFirDiagnostic { + override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) +} + internal class JavaTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, @@ -4138,59 +4194,3 @@ internal class IllegalJavaLangRecordSupertypeImpl( override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) } -internal class OverrideCannotBeStaticImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.OverrideCannotBeStatic(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class JvmStaticNotInObjectOrClassCompanionImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.JvmStaticNotInObjectOrClassCompanion(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class JvmStaticNotInObjectOrCompanionImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.JvmStaticNotInObjectOrCompanion(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class JvmStaticOnNonPublicMemberImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.JvmStaticOnNonPublicMember(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class JvmStaticOnConstOrJvmFieldImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.JvmStaticOnConstOrJvmField(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class JvmStaticOnExternalInInterfaceImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.JvmStaticOnExternalInInterface(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class InapplicableJvmNameImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.InapplicableJvmName(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} - -internal class IllegalJvmNameImpl( - firDiagnostic: FirPsiDiagnostic, - override val token: ValidityToken, -) : KtFirDiagnostic.IllegalJvmName(), KtAbstractFirDiagnostic { - override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic) -} -