FE 1.0: use TYPE_VARIANCE_CONFLICT deprecation factory

This commit is contained in:
Mikhail Glukhikh
2022-03-03 11:44:33 +03:00
committed by Space
parent 7781413a93
commit ebed224f82
31 changed files with 204 additions and 209 deletions
@@ -1911,8 +1911,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.TYPE_VARIANCE_CONFLICT) { firDiagnostic ->
TypeVarianceConflictImpl(
add(FirErrors.TYPE_VARIANCE_CONFLICT_ERROR) { firDiagnostic ->
TypeVarianceConflictErrorImpl(
firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a),
firDiagnostic.b,
firDiagnostic.c,
@@ -1358,8 +1358,8 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract val typeB: KtType
}
abstract class TypeVarianceConflict : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = TypeVarianceConflict::class
abstract class TypeVarianceConflictError : KtFirDiagnostic<PsiElement>() {
override val diagnosticClass get() = TypeVarianceConflictError::class
abstract val typeParameter: KtTypeParameterSymbol
abstract val typeParameterVariance: Variance
abstract val variance: Variance
@@ -1632,14 +1632,14 @@ internal class IncompatibleTypesWarningImpl(
override val token: ValidityToken,
) : KtFirDiagnostic.IncompatibleTypesWarning(), KtAbstractFirDiagnostic<KtElement>
internal class TypeVarianceConflictImpl(
internal class TypeVarianceConflictErrorImpl(
override val typeParameter: KtTypeParameterSymbol,
override val typeParameterVariance: Variance,
override val variance: Variance,
override val containingType: KtType,
override val firDiagnostic: KtPsiDiagnostic,
override val token: ValidityToken,
) : KtFirDiagnostic.TypeVarianceConflict(), KtAbstractFirDiagnostic<PsiElement>
) : KtFirDiagnostic.TypeVarianceConflictError(), KtAbstractFirDiagnostic<PsiElement>
internal class TypeVarianceConflictInExpandedTypeImpl(
override val typeParameter: KtTypeParameterSymbol,