azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: Use ClassId instead of FqName in FIR diagnostics

Browse Source 
IJ-CR-118828
KT-MR-13391
This commit is contained in:
Alexey Belkov
2023-12-06 15:27:47 +04:00
committed by Space Team
parent 061734d84b
commit 1766d0e86a
8 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
+6 -6
View File
@@ -976,25 +976,25 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
interface OptInUsage : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = OptInUsage::class
val optInMarkerFqName: FqName
val optInMarkerClassId: ClassId
val message: String
}
interface OptInUsageError : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = OptInUsageError::class
val optInMarkerFqName: FqName
val optInMarkerClassId: ClassId
val message: String
}
interface OptInOverride : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = OptInOverride::class
val optInMarkerFqName: FqName
val optInMarkerClassId: ClassId
val message: String
}
interface OptInOverrideError : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = OptInOverrideError::class
val optInMarkerFqName: FqName
val optInMarkerClassId: ClassId
val message: String
}
@@ -1016,7 +1016,7 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
interface OptInArgumentIsNotMarker : KtFirDiagnostic<KtAnnotationEntry> {
override val diagnosticClass get() = OptInArgumentIsNotMarker::class
val notMarkerFqName: FqName
val notMarkerClassId: ClassId
}
interface OptInMarkerWithWrongTarget : KtFirDiagnostic<KtAnnotationEntry> {
@@ -1799,7 +1799,7 @@ sealed interface KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
interface PlatformClassMappedToKotlin : KtFirDiagnostic<PsiElement> {
override val diagnosticClass get() = PlatformClassMappedToKotlin::class
val kotlinClass: FqName
val kotlinClass: ClassId
}
interface InferredTypeVariableIntoEmptyIntersectionError : KtFirDiagnostic<PsiElement> {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+6 -6
View File
@@ -1170,28 +1170,28 @@ internal class WrongJsQualifierImpl(
) : KtAbstractFirDiagnostic<KtElement>(firDiagnostic, token), KtFirDiagnostic.WrongJsQualifier
internal class OptInUsageImpl(
override val optInMarkerFqName: FqName,
override val optInMarkerClassId: ClassId,
override val message: String,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.OptInUsage
internal class OptInUsageErrorImpl(
override val optInMarkerFqName: FqName,
override val optInMarkerClassId: ClassId,
override val message: String,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.OptInUsageError
internal class OptInOverrideImpl(
override val optInMarkerFqName: FqName,
override val optInMarkerClassId: ClassId,
override val message: String,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.OptInOverride
internal class OptInOverrideErrorImpl(
override val optInMarkerFqName: FqName,
override val optInMarkerClassId: ClassId,
override val message: String,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
@@ -1218,7 +1218,7 @@ internal class OptInWithoutArgumentsImpl(
) : KtAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KtFirDiagnostic.OptInWithoutArguments
internal class OptInArgumentIsNotMarkerImpl(
override val notMarkerFqName: FqName,
override val notMarkerClassId: ClassId,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KtFirDiagnostic.OptInArgumentIsNotMarker
@@ -2161,7 +2161,7 @@ internal class RedundantNullableImpl(
) : KtAbstractFirDiagnostic<KtTypeReference>(firDiagnostic, token), KtFirDiagnostic.RedundantNullable
internal class PlatformClassMappedToKotlinImpl(
override val kotlinClass: FqName,
override val kotlinClass: ClassId,
firDiagnostic: KtPsiDiagnostic,
token: KtLifetimeToken,
) : KtAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KtFirDiagnostic.PlatformClassMappedToKotlin