[FIR] Quick fix FirModifierChecker

This commit is contained in:
Nikolay Lunyak
2021-08-20 03:15:09 +03:00
committed by TeamCityServer
parent 25124cca3d
commit 56b2a984ce
12 changed files with 14 additions and 94 deletions
@@ -2430,20 +2430,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.INAPPLICABLE_BACKING_FIELD_VISIBILITY) { firDiagnostic ->
InapplicableBackingFieldVisibilityImpl(
firDiagnostic.a,
firDiagnostic as FirPsiDiagnostic,
token,
)
}
add(FirErrors.INAPPLICABLE_BACKING_FIELD_MODIFIER) { firDiagnostic ->
InapplicableBackingFieldModifierImpl(
firDiagnostic.a,
firDiagnostic as FirPsiDiagnostic,
token,
)
}
add(FirErrors.EXPLICIT_BACKING_FIELD_IN_INTERFACE) { firDiagnostic ->
ExplicitBackingFieldInInterfaceImpl(
firDiagnostic as FirPsiDiagnostic,
@@ -1719,16 +1719,6 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = PropertyMustHaveSetter::class
}
abstract class InapplicableBackingFieldVisibility : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = InapplicableBackingFieldVisibility::class
abstract val modifier: KtModifierKeywordToken
}
abstract class InapplicableBackingFieldModifier : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = InapplicableBackingFieldModifier::class
abstract val modifier: KtModifierKeywordToken
}
abstract class ExplicitBackingFieldInInterface : KtFirDiagnostic<KtBackingField>() {
override val diagnosticClass get() = ExplicitBackingFieldInInterface::class
}
@@ -2818,6 +2818,13 @@ internal class ExplicitBackingFieldInAbstractPropertyImpl(
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class AbstractPropertyInPrimaryConstructorParametersImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.AbstractPropertyInPrimaryConstructorParameters(), KtAbstractFirDiagnostic<KtModifierListOwner> {
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
}
internal class ExpectedDeclarationWithBodyImpl(
firDiagnostic: FirPsiDiagnostic,
override val token: ValidityToken,