[FIR] Rename PLUGIN_ANNOTATION_AMBIGUITY to COMPILER_REQUIRED_ANNOTATION_AMBIGUITY

This diagnostic may be reported even without any compiler plugins (e.g.
  for annotation named `Target` or `Deprecated`), so the old name
  and message were quite confusing

^KT-64654
This commit is contained in:
Dmitriy Novozhilov
2024-01-02 16:14:47 +02:00
committed by Space Team
parent 5728b34733
commit 56221467ff
10 changed files with 15 additions and 16 deletions
@@ -1154,8 +1154,8 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token,
)
}
add(FirErrors.PLUGIN_ANNOTATION_AMBIGUITY) { firDiagnostic ->
PluginAnnotationAmbiguityImpl(
add(FirErrors.COMPILER_REQUIRED_ANNOTATION_AMBIGUITY) { firDiagnostic ->
CompilerRequiredAnnotationAmbiguityImpl(
firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b),
firDiagnostic as KtPsiDiagnostic,
@@ -839,8 +839,8 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
override val diagnosticClass get() = AnnotationInWhereClauseError::class
}
interface PluginAnnotationAmbiguity : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = PluginAnnotationAmbiguity::class
interface CompilerRequiredAnnotationAmbiguity : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = CompilerRequiredAnnotationAmbiguity::class
val typeFromCompilerPhase: KtType
val typeFromTypesPhase: KtType
}
@@ -1004,12 +1004,12 @@ internal class AnnotationInWhereClauseErrorImpl(
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KtFirDiagnostic.AnnotationInWhereClauseError
internal class PluginAnnotationAmbiguityImpl(
internal class CompilerRequiredAnnotationAmbiguityImpl(
override val typeFromCompilerPhase: KtType,
override val typeFromTypesPhase: KtType,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.PluginAnnotationAmbiguity
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.CompilerRequiredAnnotationAmbiguity
internal class AmbiguousAnnotationArgumentImpl(
override val symbols: List<KtSymbol>,