From 31c58767cf3a38a0538a035cf4a9611316c66c31 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 17 Sep 2021 22:13:23 +0200 Subject: [PATCH] Rearrange fir diagnostic for further reuse --- .../KtFirAnalysisSessionComponent.kt | 12 +- .../api/fir/components/KtFirCallResolver.kt | 4 +- .../fir/components/KtFirDiagnosticProvider.kt | 9 +- .../diagnostics/KtAbstractFirDiagnostic.kt | 12 +- .../fir/diagnostics/KtDiagnosticConverter.kt | 38 +- .../diagnostics/KtFirDataClassConverters.kt | 1224 ++++++++-------- .../fir/diagnostics/KtFirDiagnosticsImpl.kt | 1232 ++++++++--------- analysis/low-level-api-fir/build.gradle.kts | 1 + .../api/fir/FirModuleResolveStateDepended.kt | 6 +- .../api/fir/FirModuleResolveStateImpl.kt | 22 +- .../api/fir/api/FirModuleResolveState.kt | 7 +- .../level/api/fir/api/LowLevelFirApiFacade.kt | 6 +- .../fir/diagnostics/DiagnosticsCollector.kt | 6 +- .../FileStructureElementDiagnosticList.kt | 8 +- .../FileStructureElementDiagnostics.kt | 10 +- .../diagnostics/FirIdeDiagnosticReporter.kt | 31 +- .../api/fir/file/structure/FileStructure.kt | 12 +- .../based/LowLevelFirAnalyzerFacade.kt | 7 +- .../FirDiagnosticsCompilerResultsReporter.kt | 18 +- .../FirKotlinToJvmBytecodeCompiler.kt | 10 +- .../diagnostics/FirJvmDefaultErrorMessages.kt | 2 +- .../checkers/context/CheckerContext.kt | 21 +- ...esExtensionPropertyTypeParameterChecker.kt | 13 +- ...FirExplicitBackingFieldForbiddenChecker.kt | 4 +- .../declaration/FirModifierChecker.kt | 4 +- .../FirAnnotationArgumentChecker.kt | 6 +- .../checkers/expression/FirForLoopChecker.kt | 8 +- .../checkers/expression/FirReifiedChecker.kt | 2 +- .../FirExplicitApiDeclarationChecker.kt | 20 +- ...ocalVariableTypeParametersSyntaxChecker.kt | 5 +- .../syntax/FirRedundantLabelChecker.kt | 28 +- .../AbstractDiagnosticCollectorVisitor.kt | 2 +- .../collectors/FirDiagnosticsCollector.kt | 4 - .../diagnostics/DiagnosticReporter.kt | 235 +--- .../diagnostics/FirDefaultErrorMessages.kt | 20 +- .../FirDiagnosticParameterRenderer.kt | 10 - .../diagnostics/FirDiagnosticRenderers.kt | 22 +- .../diagnostics/FirDiagnosticReportHelpers.kt | 224 +++ .../{FirDiagnostic.kt => KtDiagnostic.kt} | 94 +- ...osticFactory.kt => KtDiagnosticFactory.kt} | 126 +- ...actoryDsl.kt => KtDiagnosticFactoryDsl.kt} | 60 +- .../KtDiagnosticFactoryToRendererMap.kt | 62 +- ...ticRenderer.kt => KtDiagnosticRenderer.kt} | 54 +- .../diagnostics/KtDiagnosticRenderers.kt | 39 + .../LightTreePositioningStrategies.kt | 10 +- .../LightTreePositioningStrategy.kt | 2 +- ...trategy.kt => PsiPositioningStrategies.kt} | 8 +- .../SourceElementPositioningStrategies.kt | 4 +- .../SourceElementPositioningStrategy.kt | 4 +- .../coneDiagnosticToFirDiagnostic.kt | 42 +- .../impl/BaseDiagnosticReporter.kt | 4 +- .../impl/DeduplicatingDiagnosticReporter.kt | 10 +- .../impl/DiagnosticReporterWithSuppress.kt | 10 +- .../impl/SimpleDiagnosticReporter.kt | 10 +- .../kotlin/fir/analysis/FirAnalyzerFacade.kt | 8 +- .../jetbrains/kotlin/fir/pipeline/analyse.kt | 4 +- .../fir/handlers/FirDiagnosticCodeMetaInfo.kt | 8 +- .../fir/handlers/FirDiagnosticsHandler.kt | 16 +- .../fir/AbstractFirBaseDiagnosticsTest.kt | 8 +- .../kotlin/fir/AbstractFirDiagnosticTest.kt | 26 +- .../AbstractFirOldFrontendDiagnosticsTest.kt | 2 +- 61 files changed, 1972 insertions(+), 1944 deletions(-) delete mode 100644 compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticParameterRenderer.kt create mode 100644 compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticReportHelpers.kt rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/{FirDiagnostic.kt => KtDiagnostic.kt} (61%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/{FirDiagnosticFactory.kt => KtDiagnosticFactory.kt} (54%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/{FirDiagnosticFactoryDsl.kt => KtDiagnosticFactoryDsl.kt} (73%) rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/{FirDiagnosticRenderer.kt => KtDiagnosticRenderer.kt} (62%) create mode 100644 compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderers.kt rename compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/{FirPsiPositioningStrategy.kt => PsiPositioningStrategies.kt} (86%) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt index cb91691044a..c0f587cb30f 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirAnalysisSessionComponent.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.analysis.api.fir.types.KtFirType import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.analysis.diagnostics.toFirDiagnostics import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -41,17 +41,17 @@ internal interface KtFirAnalysisSessionComponent { fun ConeKotlinType.asKtType() = analysisSession.firSymbolBuilder.typeBuilder.buildKtType(this) - fun FirPsiDiagnostic.asKtDiagnostic(): KtDiagnosticWithPsi<*> = - KT_DIAGNOSTIC_CONVERTER.convert(analysisSession, this as FirDiagnostic) + fun KtPsiDiagnostic.asKtDiagnostic(): KtDiagnosticWithPsi<*> = + KT_DIAGNOSTIC_CONVERTER.convert(analysisSession, this as KtDiagnostic) fun ConeDiagnostic.asKtDiagnostic( source: KtSourceElement, qualifiedAccessSource: KtSourceElement?, - diagnosticCache: MutableList + diagnosticCache: MutableList ): KtDiagnosticWithPsi<*>? { val firDiagnostic = toFirDiagnostics(analysisSession.rootModuleSession, source, qualifiedAccessSource).firstOrNull() ?: return null diagnosticCache += firDiagnostic - check(firDiagnostic is FirPsiDiagnostic) + check(firDiagnostic is KtPsiDiagnostic) return firDiagnostic.asKtDiagnostic() } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt index d26c374fee3..e6c93b8c3ed 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor import org.jetbrains.kotlin.analysis.api.withValidityAssertion import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.realPsi @@ -49,7 +49,7 @@ internal class KtFirCallResolver( override val analysisSession: KtFirAnalysisSession, override val token: ValidityToken, ) : AbstractKtCallResolver(), KtFirAnalysisSessionComponent { - private val diagnosticCache = mutableListOf() + private val diagnosticCache = mutableListOf() private val cache: ConcurrentHashMap = ConcurrentHashMap() override fun resolveAccessorCall(call: KtSimpleNameExpression): KtCall? = withValidityAssertion { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirDiagnosticProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirDiagnosticProvider.kt index 05bb2bfc777..59a0b0b20d0 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirDiagnosticProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirDiagnosticProvider.kt @@ -5,16 +5,15 @@ package org.jetbrains.kotlin.analysis.api.fir.components -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile -import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getDiagnostics -import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticProvider import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession +import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.withValidityAssertion +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile +import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getDiagnostics import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtAbstractFirDiagnostic.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtAbstractFirDiagnostic.kt index f1708a79f02..661dd062f6a 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtAbstractFirDiagnostic.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtAbstractFirDiagnostic.kt @@ -8,22 +8,22 @@ package org.jetbrains.kotlin.analysis.api.fir.diagnostics import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.ValidityTokenOwner -import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi import org.jetbrains.kotlin.analysis.api.withValidityAssertion +import org.jetbrains.kotlin.diagnostics.Severity +import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic internal interface KtAbstractFirDiagnostic : KtDiagnosticWithPsi, ValidityTokenOwner { - val firDiagnostic: FirPsiDiagnostic + val firDiagnostic: KtPsiDiagnostic override val factoryName: String get() = withValidityAssertion { firDiagnostic.factory.name } override val defaultMessage: String get() = withValidityAssertion { - val diagnostic = firDiagnostic as FirDiagnostic + val diagnostic = firDiagnostic as KtDiagnostic val firDiagnosticRenderer = FirDefaultErrorMessages.getRendererForDiagnostic(diagnostic) return firDiagnosticRenderer.render(diagnostic) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtDiagnosticConverter.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtDiagnosticConverter.kt index ddb0b02feb6..fff7e220966 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtDiagnosticConverter.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtDiagnosticConverter.kt @@ -5,33 +5,33 @@ package org.jetbrains.kotlin.analysis.api.fir.diagnostics -import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession +import org.jetbrains.kotlin.fir.analysis.diagnostics.* internal interface KtFirDiagnosticCreator internal fun interface KtFirDiagnostic0Creator : KtFirDiagnosticCreator { - fun KtFirAnalysisSession.create(diagnostic: FirSimpleDiagnostic): KtFirDiagnostic<*> + fun KtFirAnalysisSession.create(diagnostic: KtSimpleDiagnostic): KtFirDiagnostic<*> } internal fun interface KtFirDiagnostic1Creator : KtFirDiagnosticCreator { - fun KtFirAnalysisSession.create(diagnostic: FirDiagnosticWithParameters1): KtFirDiagnostic<*> + fun KtFirAnalysisSession.create(diagnostic: KtDiagnosticWithParameters1): KtFirDiagnostic<*> } internal fun interface KtFirDiagnostic2Creator : KtFirDiagnosticCreator { - fun KtFirAnalysisSession.create(diagnostic: FirDiagnosticWithParameters2): KtFirDiagnostic<*> + fun KtFirAnalysisSession.create(diagnostic: KtDiagnosticWithParameters2): KtFirDiagnostic<*> } internal fun interface KtFirDiagnostic3Creator : KtFirDiagnosticCreator { - fun KtFirAnalysisSession.create(diagnostic: FirDiagnosticWithParameters3): KtFirDiagnostic<*> + fun KtFirAnalysisSession.create(diagnostic: KtDiagnosticWithParameters3): KtFirDiagnostic<*> } internal fun interface KtFirDiagnostic4Creator : KtFirDiagnosticCreator { - fun KtFirAnalysisSession.create(diagnostic: FirDiagnosticWithParameters4): KtFirDiagnostic<*> + fun KtFirAnalysisSession.create(diagnostic: KtDiagnosticWithParameters4): KtFirDiagnostic<*> } -internal class KtDiagnosticConverter(private val conversions: Map) { - fun convert(analysisSession: KtFirAnalysisSession, diagnostic: FirDiagnostic): KtFirDiagnostic<*> { +internal class KtDiagnosticConverter(private val conversions: Map) { + fun convert(analysisSession: KtFirAnalysisSession, diagnostic: KtDiagnostic): KtFirDiagnostic<*> { val creator = conversions[diagnostic.factory] ?: error("No conversion was found for ${diagnostic.factory}") @@ -39,19 +39,19 @@ internal class KtDiagnosticConverter(private val conversions: Map with(creator) { - create(diagnostic as FirSimpleDiagnostic) + create(diagnostic as KtSimpleDiagnostic) } is KtFirDiagnostic1Creator<*> -> with(creator as KtFirDiagnostic1Creator) { - create(diagnostic as FirDiagnosticWithParameters1) + create(diagnostic as KtDiagnosticWithParameters1) } is KtFirDiagnostic2Creator<*, *> -> with(creator as KtFirDiagnostic2Creator) { - create(diagnostic as FirDiagnosticWithParameters2) + create(diagnostic as KtDiagnosticWithParameters2) } is KtFirDiagnostic3Creator<*, *, *> -> with(creator as KtFirDiagnostic3Creator) { - create(diagnostic as FirDiagnosticWithParameters3) + create(diagnostic as KtDiagnosticWithParameters3) } is KtFirDiagnostic4Creator<*, *, *, *> -> with(creator as KtFirDiagnostic4Creator) { - create(diagnostic as FirDiagnosticWithParameters4) + create(diagnostic as KtDiagnosticWithParameters4) } else -> error("Invalid KtFirDiagnosticCreator ${creator::class.simpleName}") } @@ -60,25 +60,25 @@ internal class KtDiagnosticConverter(private val conversions: Map() + private val conversions = mutableMapOf() - fun add(diagnostic: FirDiagnosticFactory0, creator: KtFirDiagnostic0Creator) { + fun add(diagnostic: KtDiagnosticFactory0, creator: KtFirDiagnostic0Creator) { conversions[diagnostic] = creator } - fun add(diagnostic: FirDiagnosticFactory1, creator: KtFirDiagnostic1Creator) { + fun add(diagnostic: KtDiagnosticFactory1, creator: KtFirDiagnostic1Creator) { conversions[diagnostic] = creator } - fun add(diagnostic: FirDiagnosticFactory2, creator: KtFirDiagnostic2Creator) { + fun add(diagnostic: KtDiagnosticFactory2, creator: KtFirDiagnostic2Creator) { conversions[diagnostic] = creator } - fun add(diagnostic: FirDiagnosticFactory3, creator: KtFirDiagnostic3Creator) { + fun add(diagnostic: KtDiagnosticFactory3, creator: KtFirDiagnostic3Creator) { conversions[diagnostic] = creator } - fun add(diagnostic: FirDiagnosticFactory4, creator: KtFirDiagnostic4Creator) { + fun add(diagnostic: KtDiagnosticFactory4, creator: KtFirDiagnostic4Creator) { conversions[diagnostic] = creator } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt index 39c0b619e13..68410729e89 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.fir.diagnostics import org.jetbrains.kotlin.KtPsiSourceElement import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.psi @@ -49,176 +49,176 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.UNSUPPORTED) { firDiagnostic -> UnsupportedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNSUPPORTED_FEATURE) { firDiagnostic -> UnsupportedFeatureImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NEW_INFERENCE_ERROR) { firDiagnostic -> NewInferenceErrorImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SYNTAX) { firDiagnostic -> SyntaxImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OTHER_ERROR) { firDiagnostic -> OtherErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_CONST_EXPRESSION) { firDiagnostic -> IllegalConstExpressionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_UNDERSCORE) { firDiagnostic -> IllegalUnderscoreImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPRESSION_EXPECTED) { firDiagnostic -> ExpressionExpectedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNMENT_IN_EXPRESSION_CONTEXT) { firDiagnostic -> AssignmentInExpressionContextImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BREAK_OR_CONTINUE_OUTSIDE_A_LOOP) { firDiagnostic -> BreakOrContinueOutsideALoopImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_A_LOOP_LABEL) { firDiagnostic -> NotALoopLabelImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY) { firDiagnostic -> BreakOrContinueJumpsAcrossFunctionBoundaryImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARIABLE_EXPECTED) { firDiagnostic -> VariableExpectedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATION_IN_INTERFACE) { firDiagnostic -> DelegationInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATION_NOT_TO_INTERFACE) { firDiagnostic -> DelegationNotToInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NESTED_CLASS_NOT_ALLOWED) { firDiagnostic -> NestedClassNotAllowedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INCORRECT_CHARACTER_LITERAL) { firDiagnostic -> IncorrectCharacterLiteralImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EMPTY_CHARACTER_LITERAL) { firDiagnostic -> EmptyCharacterLiteralImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TOO_MANY_CHARACTERS_IN_CHARACTER_LITERAL) { firDiagnostic -> TooManyCharactersInCharacterLiteralImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_ESCAPE) { firDiagnostic -> IllegalEscapeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INT_LITERAL_OUT_OF_RANGE) { firDiagnostic -> IntLiteralOutOfRangeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FLOAT_LITERAL_OUT_OF_RANGE) { firDiagnostic -> FloatLiteralOutOfRangeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.WRONG_LONG_SUFFIX) { firDiagnostic -> WrongLongSuffixImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DIVISION_BY_ZERO) { firDiagnostic -> DivisionByZeroImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_OR_VAR_ON_LOOP_PARAMETER) { firDiagnostic -> ValOrVarOnLoopParameterImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_OR_VAR_ON_FUN_PARAMETER) { firDiagnostic -> ValOrVarOnFunParameterImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_OR_VAR_ON_CATCH_PARAMETER) { firDiagnostic -> ValOrVarOnCatchParameterImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER) { firDiagnostic -> ValOrVarOnSecondaryConstructorParameterImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -234,44 +234,44 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.INVISIBLE_REFERENCE) { firDiagnostic -> InvisibleReferenceImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNRESOLVED_REFERENCE) { firDiagnostic -> UnresolvedReferenceImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNRESOLVED_LABEL) { firDiagnostic -> UnresolvedLabelImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DESERIALIZATION_ERROR) { firDiagnostic -> DeserializationErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ERROR_FROM_JAVA_RESOLUTION) { firDiagnostic -> ErrorFromJavaResolutionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MISSING_STDLIB_CLASS) { firDiagnostic -> MissingStdlibClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_THIS) { firDiagnostic -> NoThisImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -279,7 +279,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecationErrorImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -287,7 +287,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecationImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -296,13 +296,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS) { firDiagnostic -> CreatingAnInstanceOfAbstractClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -310,19 +310,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert FunctionCallExpectedImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_SELECTOR) { firDiagnostic -> IllegalSelectorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_RECEIVER_ALLOWED) { firDiagnostic -> NoReceiverAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -330,14 +330,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert FunctionExpectedImpl( firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RESOLUTION_TO_CLASSIFIER) { firDiagnostic -> ResolutionToClassifierImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -369,105 +369,105 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirJvmErrors.SUPER_CALL_WITH_DEFAULT_PARAMETERS) { firDiagnostic -> SuperCallWithDefaultParametersImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER) { firDiagnostic -> InterfaceCantCallDefaultMethodViaSuperImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_A_SUPERTYPE) { firDiagnostic -> NotASupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_ARGUMENTS_REDUNDANT_IN_SUPER_QUALIFIER) { firDiagnostic -> TypeArgumentsRedundantInSuperQualifierImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE) { firDiagnostic -> SuperclassNotAccessibleFromInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE) { firDiagnostic -> QualifiedSupertypeExtendedByOtherSupertypeImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_INITIALIZED_IN_INTERFACE) { firDiagnostic -> SupertypeInitializedInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INTERFACE_WITH_SUPERCLASS) { firDiagnostic -> InterfaceWithSuperclassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FINAL_SUPERTYPE) { firDiagnostic -> FinalSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CLASS_CANNOT_BE_EXTENDED_DIRECTLY) { firDiagnostic -> ClassCannotBeExtendedDirectlyImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_IS_EXTENSION_FUNCTION_TYPE) { firDiagnostic -> SupertypeIsExtensionFunctionTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SINGLETON_IN_SUPERTYPE) { firDiagnostic -> SingletonInSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NULLABLE_SUPERTYPE) { firDiagnostic -> NullableSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MANY_CLASSES_IN_SUPERTYPE_LIST) { firDiagnostic -> ManyClassesInSupertypeListImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_APPEARS_TWICE) { firDiagnostic -> SupertypeAppearsTwiceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CLASS_IN_SUPERTYPE_FOR_ENUM) { firDiagnostic -> ClassInSupertypeForEnumImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SEALED_SUPERTYPE) { firDiagnostic -> SealedSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -475,51 +475,51 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert SealedSupertypeInLocalClassImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SEALED_INHERITOR_IN_DIFFERENT_PACKAGE) { firDiagnostic -> SealedInheritorInDifferentPackageImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SEALED_INHERITOR_IN_DIFFERENT_MODULE) { firDiagnostic -> SealedInheritorInDifferentModuleImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CLASS_INHERITS_JAVA_SEALED_CLASS) { firDiagnostic -> ClassInheritsJavaSealedClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_NOT_A_CLASS_OR_INTERFACE) { firDiagnostic -> SupertypeNotAClassOrInterfaceImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CYCLIC_INHERITANCE_HIERARCHY) { firDiagnostic -> CyclicInheritanceHierarchyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPANDED_TYPE_CANNOT_BE_INHERITED) { firDiagnostic -> ExpandedTypeCannotBeInheritedImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROJECTION_IN_IMMEDIATE_ARGUMENT_TO_SUPERTYPE) { firDiagnostic -> ProjectionInImmediateArgumentToSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -530,7 +530,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.c.map { coneKotlinType -> firSymbolBuilder.typeBuilder.buildKtType(coneKotlinType) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -541,7 +541,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.c.map { coneKotlinType -> firSymbolBuilder.typeBuilder.buildKtType(coneKotlinType) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -550,237 +550,237 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { coneKotlinType -> firSymbolBuilder.typeBuilder.buildKtType(coneKotlinType) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONSTRUCTOR_IN_OBJECT) { firDiagnostic -> ConstructorInObjectImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONSTRUCTOR_IN_INTERFACE) { firDiagnostic -> ConstructorInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_PRIVATE_CONSTRUCTOR_IN_ENUM) { firDiagnostic -> NonPrivateConstructorInEnumImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_PRIVATE_OR_PROTECTED_CONSTRUCTOR_IN_SEALED) { firDiagnostic -> NonPrivateOrProtectedConstructorInSealedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CYCLIC_CONSTRUCTOR_DELEGATION_CALL) { firDiagnostic -> CyclicConstructorDelegationCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED) { firDiagnostic -> PrimaryConstructorDelegationCallExpectedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_NOT_INITIALIZED) { firDiagnostic -> SupertypeNotInitializedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR) { firDiagnostic -> SupertypeInitializedWithoutPrimaryConstructorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATION_SUPER_CALL_IN_ENUM_CONSTRUCTOR) { firDiagnostic -> DelegationSuperCallInEnumConstructorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIMARY_CONSTRUCTOR_REQUIRED_FOR_DATA_CLASS) { firDiagnostic -> PrimaryConstructorRequiredForDataClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPLICIT_DELEGATION_CALL_REQUIRED) { firDiagnostic -> ExplicitDelegationCallRequiredImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SEALED_CLASS_CONSTRUCTOR_CALL) { firDiagnostic -> SealedClassConstructorCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DATA_CLASS_WITHOUT_PARAMETERS) { firDiagnostic -> DataClassWithoutParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DATA_CLASS_VARARG_PARAMETER) { firDiagnostic -> DataClassVarargParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DATA_CLASS_NOT_PROPERTY_PARAMETER) { firDiagnostic -> DataClassNotPropertyParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ARGUMENT_KCLASS_LITERAL_OF_TYPE_PARAMETER_ERROR) { firDiagnostic -> AnnotationArgumentKclassLiteralOfTypeParameterErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ARGUMENT_MUST_BE_CONST) { firDiagnostic -> AnnotationArgumentMustBeConstImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ARGUMENT_MUST_BE_ENUM_CONST) { firDiagnostic -> AnnotationArgumentMustBeEnumConstImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ARGUMENT_MUST_BE_KCLASS_LITERAL) { firDiagnostic -> AnnotationArgumentMustBeKclassLiteralImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_CLASS_MEMBER) { firDiagnostic -> AnnotationClassMemberImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_PARAMETER_DEFAULT_VALUE_MUST_BE_CONSTANT) { firDiagnostic -> AnnotationParameterDefaultValueMustBeConstantImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INVALID_TYPE_OF_ANNOTATION_MEMBER) { firDiagnostic -> InvalidTypeOfAnnotationMemberImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LOCAL_ANNOTATION_CLASS_ERROR) { firDiagnostic -> LocalAnnotationClassErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MISSING_VAL_ON_ANNOTATION_PARAMETER) { firDiagnostic -> MissingValOnAnnotationParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION) { firDiagnostic -> NonConstValUsedInConstantExpressionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_CLASS_CONSTRUCTOR_CALL) { firDiagnostic -> AnnotationClassConstructorCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_AN_ANNOTATION_CLASS) { firDiagnostic -> NotAnAnnotationClassImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NULLABLE_TYPE_OF_ANNOTATION_MEMBER) { firDiagnostic -> NullableTypeOfAnnotationMemberImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAR_ANNOTATION_PARAMETER) { firDiagnostic -> VarAnnotationParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPES_FOR_ANNOTATION_CLASS) { firDiagnostic -> SupertypesForAnnotationClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_USED_AS_ANNOTATION_ARGUMENT) { firDiagnostic -> AnnotationUsedAsAnnotationArgumentImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_KOTLIN_VERSION_STRING_VALUE) { firDiagnostic -> IllegalKotlinVersionStringValueImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NEWER_VERSION_IN_SINCE_KOTLIN) { firDiagnostic -> NewerVersionInSinceKotlinImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_SINCE_KOTLIN_WITH_UNORDERED_VERSIONS) { firDiagnostic -> DeprecatedSinceKotlinWithUnorderedVersionsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_SINCE_KOTLIN_WITHOUT_ARGUMENTS) { firDiagnostic -> DeprecatedSinceKotlinWithoutArgumentsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_SINCE_KOTLIN_WITHOUT_DEPRECATED) { firDiagnostic -> DeprecatedSinceKotlinWithoutDeprecatedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_SINCE_KOTLIN_WITH_DEPRECATED_LEVEL) { firDiagnostic -> DeprecatedSinceKotlinWithDeprecatedLevelImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_SINCE_KOTLIN_OUTSIDE_KOTLIN_SUBPACKAGE) { firDiagnostic -> DeprecatedSinceKotlinOutsideKotlinSubpackageImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -788,38 +788,38 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OverrideDeprecationImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ON_SUPERCLASS.errorFactory) { firDiagnostic -> AnnotationOnSuperclassErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANNOTATION_ON_SUPERCLASS.warningFactory) { firDiagnostic -> AnnotationOnSuperclassWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RESTRICTED_RETENTION_FOR_EXPRESSION_ANNOTATION.errorFactory) { firDiagnostic -> RestrictedRetentionForExpressionAnnotationErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RESTRICTED_RETENTION_FOR_EXPRESSION_ANNOTATION.warningFactory) { firDiagnostic -> RestrictedRetentionForExpressionAnnotationWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.WRONG_ANNOTATION_TARGET) { firDiagnostic -> WrongAnnotationTargetImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -827,64 +827,64 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongAnnotationTargetWithUseSiteTargetImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_TARGET_ON_PROPERTY) { firDiagnostic -> InapplicableTargetOnPropertyImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_TARGET_PROPERTY_IMMUTABLE) { firDiagnostic -> InapplicableTargetPropertyImmutableImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_TARGET_PROPERTY_HAS_NO_DELEGATE) { firDiagnostic -> InapplicableTargetPropertyHasNoDelegateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_TARGET_PROPERTY_HAS_NO_BACKING_FIELD) { firDiagnostic -> InapplicableTargetPropertyHasNoBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_PARAM_TARGET) { firDiagnostic -> InapplicableParamTargetImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_ANNOTATION_TARGET) { firDiagnostic -> RedundantAnnotationTargetImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_FILE_TARGET) { firDiagnostic -> InapplicableFileTargetImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REPEATED_ANNOTATION) { firDiagnostic -> RepeatedAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REPEATED_ANNOTATION_WARNING) { firDiagnostic -> RepeatedAnnotationWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -892,7 +892,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OptInUsageImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -900,7 +900,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OptInUsageErrorImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -908,7 +908,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OptInOverrideImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -916,51 +916,51 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OptInOverrideErrorImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_IS_NOT_ENABLED) { firDiagnostic -> OptInIsNotEnabledImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_CAN_ONLY_BE_USED_AS_ANNOTATION) { firDiagnostic -> OptInCanOnlyBeUsedAsAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_MARKER_CAN_ONLY_BE_USED_AS_ANNOTATION_OR_ARGUMENT_IN_OPT_IN) { firDiagnostic -> OptInMarkerCanOnlyBeUsedAsAnnotationOrArgumentInOptInImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_WITHOUT_ARGUMENTS) { firDiagnostic -> OptInWithoutArgumentsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_ARGUMENT_IS_NOT_MARKER) { firDiagnostic -> OptInArgumentIsNotMarkerImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_MARKER_WITH_WRONG_TARGET) { firDiagnostic -> OptInMarkerWithWrongTargetImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPT_IN_MARKER_WITH_WRONG_RETENTION) { firDiagnostic -> OptInMarkerWithWrongRetentionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -988,7 +988,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -997,7 +997,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1006,7 +1006,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1015,7 +1015,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1024,7 +1024,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1033,7 +1033,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1042,7 +1042,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1051,7 +1051,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1060,7 +1060,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1069,20 +1069,20 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_INFIX_MODIFIER) { firDiagnostic -> InapplicableInfixModifierImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REPEATED_MODIFIER) { firDiagnostic -> RepeatedModifierImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1090,7 +1090,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RedundantModifierImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1098,7 +1098,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecatedModifierImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1106,7 +1106,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecatedModifierPairImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1114,7 +1114,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecatedModifierForTargetImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1122,7 +1122,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RedundantModifierForTargetImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1130,13 +1130,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert IncompatibleModifiersImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_OPEN_IN_INTERFACE) { firDiagnostic -> RedundantOpenInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1144,7 +1144,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongModifierTargetImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1152,14 +1152,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OperatorModifierRequiredImpl( firSymbolBuilder.functionLikeBuilder.buildFunctionSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INFIX_MODIFIER_REQUIRED) { firDiagnostic -> InfixModifierRequiredImpl( firSymbolBuilder.functionLikeBuilder.buildFunctionSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1167,7 +1167,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongModifierContainingDeclarationImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1175,130 +1175,130 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DeprecatedModifierContainingDeclarationImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_OPERATOR_MODIFIER) { firDiagnostic -> InapplicableOperatorModifierImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_EXPLICIT_VISIBILITY_IN_API_MODE) { firDiagnostic -> NoExplicitVisibilityInApiModeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING) { firDiagnostic -> NoExplicitVisibilityInApiModeWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_EXPLICIT_RETURN_TYPE_IN_API_MODE) { firDiagnostic -> NoExplicitReturnTypeInApiModeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING) { firDiagnostic -> NoExplicitReturnTypeInApiModeWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_NOT_TOP_LEVEL) { firDiagnostic -> InlineClassNotTopLevelImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_NOT_FINAL) { firDiagnostic -> InlineClassNotFinalImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS) { firDiagnostic -> AbsenceOfPrimaryConstructorForInlineClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_CONSTRUCTOR_WRONG_PARAMETERS_SIZE) { firDiagnostic -> InlineClassConstructorWrongParametersSizeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_CONSTRUCTOR_NOT_FINAL_READ_ONLY_PARAMETER) { firDiagnostic -> InlineClassConstructorNotFinalReadOnlyParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_WITH_BACKING_FIELD_INSIDE_INLINE_CLASS) { firDiagnostic -> PropertyWithBackingFieldInsideInlineClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATED_PROPERTY_INSIDE_INLINE_CLASS) { firDiagnostic -> DelegatedPropertyInsideInlineClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE) { firDiagnostic -> InlineClassHasInapplicableParameterTypeImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_CANNOT_IMPLEMENT_INTERFACE_BY_DELEGATION) { firDiagnostic -> InlineClassCannotImplementInterfaceByDelegationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_CANNOT_EXTEND_CLASSES) { firDiagnostic -> InlineClassCannotExtendClassesImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_CLASS_CANNOT_BE_RECURSIVE) { firDiagnostic -> InlineClassCannotBeRecursiveImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RESERVED_MEMBER_INSIDE_INLINE_CLASS) { firDiagnostic -> ReservedMemberInsideInlineClassImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_INLINE_CLASS) { firDiagnostic -> SecondaryConstructorWithBodyInsideInlineClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INNER_CLASS_INSIDE_INLINE_CLASS) { firDiagnostic -> InnerClassInsideInlineClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VALUE_CLASS_CANNOT_BE_CLONEABLE) { firDiagnostic -> ValueClassCannotBeCloneableImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1307,14 +1307,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_CANDIDATE) { firDiagnostic -> InapplicableCandidateImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1323,7 +1323,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1331,7 +1331,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ThrowableTypeMismatchImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1339,7 +1339,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ConditionTypeMismatchImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1348,66 +1348,66 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NULL_FOR_NONNULL_TYPE) { firDiagnostic -> NullForNonnullTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INAPPLICABLE_LATEINIT_MODIFIER) { firDiagnostic -> InapplicableLateinitModifierImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARARG_OUTSIDE_PARENTHESES) { firDiagnostic -> VarargOutsideParenthesesImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NAMED_ARGUMENTS_NOT_ALLOWED) { firDiagnostic -> NamedArgumentsNotAllowedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_VARARG_SPREAD) { firDiagnostic -> NonVarargSpreadImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ARGUMENT_PASSED_TWICE) { firDiagnostic -> ArgumentPassedTwiceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TOO_MANY_ARGUMENTS) { firDiagnostic -> TooManyArgumentsImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_VALUE_FOR_PARAMETER) { firDiagnostic -> NoValueForParameterImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NAMED_PARAMETER_NOT_FOUND) { firDiagnostic -> NamedParameterNotFoundImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1416,7 +1416,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1424,62 +1424,62 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ResultTypeMismatchImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MANY_LAMBDA_EXPRESSION_ARGUMENTS) { firDiagnostic -> ManyLambdaExpressionArgumentsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER) { firDiagnostic -> NewInferenceNoInformationForParameterImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SPREAD_OF_NULLABLE) { firDiagnostic -> SpreadOfNullableImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION.errorFactory) { firDiagnostic -> AssigningSingleElementToVarargInNamedFormFunctionErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION.warningFactory) { firDiagnostic -> AssigningSingleElementToVarargInNamedFormFunctionWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION.errorFactory) { firDiagnostic -> AssigningSingleElementToVarargInNamedFormAnnotationErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION.warningFactory) { firDiagnostic -> AssigningSingleElementToVarargInNamedFormAnnotationWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION) { firDiagnostic -> RedundantSpreadOperatorInNamedFormInAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION) { firDiagnostic -> RedundantSpreadOperatorInNamedFormInFunctionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1488,7 +1488,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1497,7 +1497,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1506,7 +1506,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1515,7 +1515,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1524,25 +1524,25 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RECURSION_IN_IMPLICIT_TYPES) { firDiagnostic -> RecursionInImplicitTypesImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INFERENCE_ERROR) { firDiagnostic -> InferenceErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT) { firDiagnostic -> ProjectionOnNonClassTypeArgumentImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1550,7 +1550,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert UpperBoundViolatedImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1558,13 +1558,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert UpperBoundViolatedInTypealiasExpansionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_ARGUMENTS_NOT_ALLOWED) { firDiagnostic -> TypeArgumentsNotAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1572,7 +1572,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongNumberOfTypeArgumentsImpl( firDiagnostic.a, firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1580,168 +1580,168 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert NoTypeArgumentsOnRhsImpl( firDiagnostic.a, firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.b.fir as FirClass), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OUTER_CLASS_ARGUMENTS_REQUIRED) { firDiagnostic -> OuterClassArgumentsRequiredImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETERS_IN_OBJECT) { firDiagnostic -> TypeParametersInObjectImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETERS_IN_ANONYMOUS_OBJECT) { firDiagnostic -> TypeParametersInAnonymousObjectImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_PROJECTION_USAGE) { firDiagnostic -> IllegalProjectionUsageImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETERS_IN_ENUM) { firDiagnostic -> TypeParametersInEnumImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONFLICTING_PROJECTION) { firDiagnostic -> ConflictingProjectionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONFLICTING_PROJECTION_IN_TYPEALIAS_EXPANSION) { firDiagnostic -> ConflictingProjectionInTypealiasExpansionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_PROJECTION) { firDiagnostic -> RedundantProjectionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARIANCE_ON_TYPE_PARAMETER_NOT_ALLOWED) { firDiagnostic -> VarianceOnTypeParameterNotAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CATCH_PARAMETER_WITH_DEFAULT_VALUE) { firDiagnostic -> CatchParameterWithDefaultValueImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REIFIED_TYPE_IN_CATCH_CLAUSE) { firDiagnostic -> ReifiedTypeInCatchClauseImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_IN_CATCH_CLAUSE) { firDiagnostic -> TypeParameterInCatchClauseImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.GENERIC_THROWABLE_SUBCLASS) { firDiagnostic -> GenericThrowableSubclassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INNER_CLASS_OF_GENERIC_THROWABLE_SUBCLASS) { firDiagnostic -> InnerClassOfGenericThrowableSubclassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE) { firDiagnostic -> KclassWithNullableTypeParameterInSignatureImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_AS_REIFIED) { firDiagnostic -> TypeParameterAsReifiedImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_AS_REIFIED_ARRAY.errorFactory) { firDiagnostic -> TypeParameterAsReifiedArrayErrorImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_AS_REIFIED_ARRAY.warningFactory) { firDiagnostic -> TypeParameterAsReifiedArrayWarningImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REIFIED_TYPE_FORBIDDEN_SUBSTITUTION) { firDiagnostic -> ReifiedTypeForbiddenSubstitutionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FINAL_UPPER_BOUND) { firDiagnostic -> FinalUpperBoundImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UPPER_BOUND_IS_EXTENSION_FUNCTION_TYPE) { firDiagnostic -> UpperBoundIsExtensionFunctionTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BOUNDS_NOT_ALLOWED_IF_BOUNDED_BY_TYPE_PARAMETER) { firDiagnostic -> BoundsNotAllowedIfBoundedByTypeParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ONLY_ONE_CLASS_BOUND_ALLOWED) { firDiagnostic -> OnlyOneClassBoundAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REPEATED_BOUND) { firDiagnostic -> RepeatedBoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONFLICTING_UPPER_BOUNDS) { firDiagnostic -> ConflictingUpperBoundsImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1749,31 +1749,31 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert NameInConstraintIsNotATypeParameterImpl( firDiagnostic.a, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BOUND_ON_TYPE_ALIAS_PARAMETER_NOT_ALLOWED) { firDiagnostic -> BoundOnTypeAliasParameterNotAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REIFIED_TYPE_PARAMETER_NO_INLINE) { firDiagnostic -> ReifiedTypeParameterNoInlineImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETERS_NOT_ALLOWED) { firDiagnostic -> TypeParametersNotAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER) { firDiagnostic -> TypeParameterOfPropertyNotUsedInReceiverImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1783,31 +1783,31 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firSymbolBuilder.buildSymbol(firDiagnostic.c), firDiagnostic.d, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CYCLIC_GENERIC_UPPER_BOUND) { firDiagnostic -> CyclicGenericUpperBoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DEPRECATED_TYPE_PARAMETER_SYNTAX) { firDiagnostic -> DeprecatedTypeParameterSyntaxImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MISPLACED_TYPE_PARAMETER_CONSTRAINTS) { firDiagnostic -> MisplacedTypeParameterConstraintsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DYNAMIC_UPPER_BOUND) { firDiagnostic -> DynamicUpperBoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1815,7 +1815,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert IncompatibleTypesImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1823,7 +1823,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert IncompatibleTypesWarningImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1833,7 +1833,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b, firDiagnostic.c, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.d), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1843,7 +1843,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b, firDiagnostic.c, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.d), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1853,52 +1853,52 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.source!!.psi as KtExpression, firDiagnostic.c, firDiagnostic.d, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXTENSION_IN_CLASS_REFERENCE_NOT_ALLOWED) { firDiagnostic -> ExtensionInClassReferenceNotAllowedImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CALLABLE_REFERENCE_LHS_NOT_A_CLASS) { firDiagnostic -> CallableReferenceLhsNotAClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CALLABLE_REFERENCE_TO_ANNOTATION_CONSTRUCTOR) { firDiagnostic -> CallableReferenceToAnnotationConstructorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CLASS_LITERAL_LHS_NOT_A_CLASS) { firDiagnostic -> ClassLiteralLhsNotAClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NULLABLE_TYPE_IN_CLASS_LITERAL_LHS) { firDiagnostic -> NullableTypeInClassLiteralLhsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPRESSION_OF_NULLABLE_TYPE_IN_CLASS_LITERAL_LHS) { firDiagnostic -> ExpressionOfNullableTypeInClassLiteralLhsImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOTHING_TO_OVERRIDE) { firDiagnostic -> NothingToOverrideImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1906,7 +1906,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert CannotOverrideInvisibleMemberImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1914,7 +1914,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DataClassOverrideConflictImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1923,7 +1923,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1932,7 +1932,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1940,7 +1940,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OverridingFinalMemberImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1948,7 +1948,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ReturnTypeMismatchOnInheritanceImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1956,7 +1956,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert PropertyTypeMismatchOnInheritanceImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1964,7 +1964,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert VarTypeMismatchOnInheritanceImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1972,7 +1972,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ReturnTypeMismatchByDelegationImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1980,7 +1980,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert PropertyTypeMismatchByDelegationImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1988,7 +1988,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert VarOverriddenByValByDelegationImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -1997,7 +1997,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firCallableSymbol -> firSymbolBuilder.callableBuilder.buildCallableSymbol(firCallableSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2005,7 +2005,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert AbstractMemberNotImplementedImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2013,7 +2013,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert AbstractClassMemberNotImplementedImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2021,7 +2021,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert InvisibleAbstractMemberFromSuperErrorImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2029,7 +2029,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert InvisibleAbstractMemberFromSuperWarningImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2038,7 +2038,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { coneKotlinType -> firSymbolBuilder.typeBuilder.buildKtType(coneKotlinType) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2046,7 +2046,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ManyImplMemberNotImplementedImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2054,7 +2054,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ManyInterfacesMemberNotImplementedImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2062,7 +2062,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert OverridingFinalMemberByDelegationImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2070,7 +2070,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert DelegatedMemberHidesSupertypeOverrideImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2078,7 +2078,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ReturnTypeMismatchOnOverrideImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2086,7 +2086,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert PropertyTypeMismatchOnOverrideImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2094,7 +2094,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert VarTypeMismatchOnOverrideImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2102,19 +2102,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert VarOverriddenByValImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_FINAL_MEMBER_IN_FINAL_CLASS) { firDiagnostic -> NonFinalMemberInFinalClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_FINAL_MEMBER_IN_OBJECT) { firDiagnostic -> NonFinalMemberInObjectImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2122,13 +2122,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert VirtualMemberHiddenImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MANY_COMPANION_OBJECTS) { firDiagnostic -> ManyCompanionObjectsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2137,7 +2137,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2146,7 +2146,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2155,27 +2155,27 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.METHOD_OF_ANY_IMPLEMENTED_IN_INTERFACE) { firDiagnostic -> MethodOfAnyImplementedInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LOCAL_OBJECT_NOT_ALLOWED) { firDiagnostic -> LocalObjectNotAllowedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LOCAL_INTERFACE_NOT_ALLOWED) { firDiagnostic -> LocalInterfaceNotAllowedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2183,144 +2183,144 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert AbstractFunctionInNonAbstractClassImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_FUNCTION_WITH_BODY) { firDiagnostic -> AbstractFunctionWithBodyImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_ABSTRACT_FUNCTION_WITH_NO_BODY) { firDiagnostic -> NonAbstractFunctionWithNoBodyImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIVATE_FUNCTION_WITH_NO_BODY) { firDiagnostic -> PrivateFunctionWithNoBodyImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_MEMBER_FUNCTION_NO_BODY) { firDiagnostic -> NonMemberFunctionNoBodyImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUNCTION_DECLARATION_WITH_NO_NAME) { firDiagnostic -> FunctionDeclarationWithNoNameImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANONYMOUS_FUNCTION_WITH_NAME) { firDiagnostic -> AnonymousFunctionWithNameImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANONYMOUS_FUNCTION_PARAMETER_WITH_DEFAULT_VALUE) { firDiagnostic -> AnonymousFunctionParameterWithDefaultValueImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_VARARG_ON_PARAMETER) { firDiagnostic -> UselessVarargOnParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MULTIPLE_VARARG_PARAMETERS) { firDiagnostic -> MultipleVarargParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FORBIDDEN_VARARG_PARAMETER_TYPE) { firDiagnostic -> ForbiddenVarargParameterTypeImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VALUE_PARAMETER_WITH_NO_TYPE_ANNOTATION) { firDiagnostic -> ValueParameterWithNoTypeAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CANNOT_INFER_PARAMETER_TYPE) { firDiagnostic -> CannotInferParameterTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_TAIL_CALLS_FOUND) { firDiagnostic -> NoTailCallsFoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TAILREC_ON_VIRTUAL_MEMBER_ERROR) { firDiagnostic -> TailrecOnVirtualMemberErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_TAIL_RECURSIVE_CALL) { firDiagnostic -> NonTailRecursiveCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TAIL_RECURSION_IN_TRY_IS_NOT_SUPPORTED) { firDiagnostic -> TailRecursionInTryIsNotSupportedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_CONSTRUCTOR_REFERENCE) { firDiagnostic -> FunInterfaceConstructorReferenceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_WRONG_COUNT_OF_ABSTRACT_MEMBERS) { firDiagnostic -> FunInterfaceWrongCountOfAbstractMembersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_CANNOT_HAVE_ABSTRACT_PROPERTIES) { firDiagnostic -> FunInterfaceCannotHaveAbstractPropertiesImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_ABSTRACT_METHOD_WITH_TYPE_PARAMETERS) { firDiagnostic -> FunInterfaceAbstractMethodWithTypeParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_ABSTRACT_METHOD_WITH_DEFAULT_VALUE) { firDiagnostic -> FunInterfaceAbstractMethodWithDefaultValueImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.FUN_INTERFACE_WITH_SUSPEND_FUNCTION) { firDiagnostic -> FunInterfaceWithSuspendFunctionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2328,152 +2328,152 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert AbstractPropertyInNonAbstractClassImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIVATE_PROPERTY_IN_INTERFACE) { firDiagnostic -> PrivatePropertyInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_PROPERTY_WITH_INITIALIZER) { firDiagnostic -> AbstractPropertyWithInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_INITIALIZER_IN_INTERFACE) { firDiagnostic -> PropertyInitializerInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_WITH_NO_TYPE_NO_INITIALIZER) { firDiagnostic -> PropertyWithNoTypeNoInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MUST_BE_INITIALIZED) { firDiagnostic -> MustBeInitializedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MUST_BE_INITIALIZED_OR_BE_ABSTRACT) { firDiagnostic -> MustBeInitializedOrBeAbstractImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXTENSION_PROPERTY_MUST_HAVE_ACCESSORS_OR_BE_ABSTRACT) { firDiagnostic -> ExtensionPropertyMustHaveAccessorsOrBeAbstractImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNNECESSARY_LATEINIT) { firDiagnostic -> UnnecessaryLateinitImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BACKING_FIELD_IN_INTERFACE) { firDiagnostic -> BackingFieldInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXTENSION_PROPERTY_WITH_BACKING_FIELD) { firDiagnostic -> ExtensionPropertyWithBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_INITIALIZER_NO_BACKING_FIELD) { firDiagnostic -> PropertyInitializerNoBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_DELEGATED_PROPERTY) { firDiagnostic -> AbstractDelegatedPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATED_PROPERTY_IN_INTERFACE) { firDiagnostic -> DelegatedPropertyInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_PROPERTY_WITH_GETTER) { firDiagnostic -> AbstractPropertyWithGetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_PROPERTY_WITH_SETTER) { firDiagnostic -> AbstractPropertyWithSetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIVATE_SETTER_FOR_ABSTRACT_PROPERTY) { firDiagnostic -> PrivateSetterForAbstractPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PRIVATE_SETTER_FOR_OPEN_PROPERTY) { firDiagnostic -> PrivateSetterForOpenPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_WITH_SETTER) { firDiagnostic -> ValWithSetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONST_VAL_NOT_TOP_LEVEL_OR_OBJECT) { firDiagnostic -> ConstValNotTopLevelOrObjectImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONST_VAL_WITH_GETTER) { firDiagnostic -> ConstValWithGetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONST_VAL_WITH_DELEGATE) { firDiagnostic -> ConstValWithDelegateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_CANT_BE_USED_FOR_CONST_VAL) { firDiagnostic -> TypeCantBeUsedForConstValImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONST_VAL_WITHOUT_INITIALIZER) { firDiagnostic -> ConstValWithoutInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONST_VAL_WITH_NON_CONST_INITIALIZER) { firDiagnostic -> ConstValWithNonConstInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2481,19 +2481,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongSetterParameterTypeImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER) { firDiagnostic -> DelegateUsesExtensionPropertyTypeParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DELEGATE_USES_EXTENSION_PROPERTY_TYPE_PARAMETER_WARNING) { firDiagnostic -> DelegateUsesExtensionPropertyTypeParameterWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2502,25 +2502,25 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.GETTER_VISIBILITY_DIFFERS_FROM_PROPERTY_VISIBILITY) { firDiagnostic -> GetterVisibilityDiffersFromPropertyVisibilityImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SETTER_VISIBILITY_INCONSISTENT_WITH_PROPERTY_VISIBILITY) { firDiagnostic -> SetterVisibilityInconsistentWithPropertyVisibilityImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.WRONG_SETTER_RETURN_TYPE) { firDiagnostic -> WrongSetterReturnTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2528,212 +2528,212 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert WrongGetterReturnTypeImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACCESSOR_FOR_DELEGATED_PROPERTY) { firDiagnostic -> AccessorForDelegatedPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_INITIALIZER_WITH_EXPLICIT_FIELD_DECLARATION) { firDiagnostic -> PropertyInitializerWithExplicitFieldDeclarationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_FIELD_DECLARATION_MISSING_INITIALIZER) { firDiagnostic -> PropertyFieldDeclarationMissingInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LATEINIT_PROPERTY_FIELD_DECLARATION_WITH_INITIALIZER) { firDiagnostic -> LateinitPropertyFieldDeclarationWithInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LATEINIT_FIELD_IN_VAL_PROPERTY) { firDiagnostic -> LateinitFieldInValPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LATEINIT_NULLABLE_BACKING_FIELD) { firDiagnostic -> LateinitNullableBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.BACKING_FIELD_FOR_DELEGATED_PROPERTY) { firDiagnostic -> BackingFieldForDelegatedPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_MUST_HAVE_GETTER) { firDiagnostic -> PropertyMustHaveGetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_MUST_HAVE_SETTER) { firDiagnostic -> PropertyMustHaveSetterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPLICIT_BACKING_FIELD_IN_INTERFACE) { firDiagnostic -> ExplicitBackingFieldInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPLICIT_BACKING_FIELD_IN_ABSTRACT_PROPERTY) { firDiagnostic -> ExplicitBackingFieldInAbstractPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPLICIT_BACKING_FIELD_IN_EXTENSION) { firDiagnostic -> ExplicitBackingFieldInExtensionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_EXPLICIT_BACKING_FIELD) { firDiagnostic -> RedundantExplicitBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ABSTRACT_PROPERTY_IN_PRIMARY_CONSTRUCTOR_PARAMETERS) { firDiagnostic -> AbstractPropertyInPrimaryConstructorParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING) { firDiagnostic -> LocalVariableWithTypeParametersWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LOCAL_VARIABLE_WITH_TYPE_PARAMETERS) { firDiagnostic -> LocalVariableWithTypeParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_DECLARATION_WITH_BODY) { firDiagnostic -> ExpectedDeclarationWithBodyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_CLASS_CONSTRUCTOR_DELEGATION_CALL) { firDiagnostic -> ExpectedClassConstructorDelegationCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_CLASS_CONSTRUCTOR_PROPERTY_PARAMETER) { firDiagnostic -> ExpectedClassConstructorPropertyParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_ENUM_CONSTRUCTOR) { firDiagnostic -> ExpectedEnumConstructorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_ENUM_ENTRY_WITH_BODY) { firDiagnostic -> ExpectedEnumEntryWithBodyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_PROPERTY_INITIALIZER) { firDiagnostic -> ExpectedPropertyInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_DELEGATED_PROPERTY) { firDiagnostic -> ExpectedDelegatedPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_LATEINIT_PROPERTY) { firDiagnostic -> ExpectedLateinitPropertyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS) { firDiagnostic -> SupertypeInitializedInExpectedClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_PRIVATE_DECLARATION) { firDiagnostic -> ExpectedPrivateDeclarationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.IMPLEMENTATION_BY_DELEGATION_IN_EXPECT_CLASS) { firDiagnostic -> ImplementationByDelegationInExpectClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_TYPE_ALIAS_NOT_TO_CLASS) { firDiagnostic -> ActualTypeAliasNotToClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_TYPE_ALIAS_TO_CLASS_WITH_DECLARATION_SITE_VARIANCE) { firDiagnostic -> ActualTypeAliasToClassWithDeclarationSiteVarianceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_TYPE_ALIAS_WITH_USE_SITE_VARIANCE) { firDiagnostic -> ActualTypeAliasWithUseSiteVarianceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_TYPE_ALIAS_WITH_COMPLEX_SUBSTITUTION) { firDiagnostic -> ActualTypeAliasWithComplexSubstitutionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS) { firDiagnostic -> ActualFunctionWithDefaultArgumentsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_ANNOTATION_CONFLICTING_DEFAULT_ARGUMENT_VALUE) { firDiagnostic -> ActualAnnotationConflictingDefaultArgumentValueImpl( firSymbolBuilder.variableLikeBuilder.buildVariableLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_FUNCTION_SOURCE_WITH_DEFAULT_ARGUMENTS_NOT_FOUND) { firDiagnostic -> ExpectedFunctionSourceWithDefaultArgumentsNotFoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2748,7 +2748,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.buildSymbol(firBasedSymbol.fir) } }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2762,7 +2762,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.buildSymbol(firBasedSymbol.fir) } }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2772,7 +2772,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2782,7 +2782,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firModuleData -> firModuleData }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2798,19 +2798,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } } }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ACTUAL_MISSING) { firDiagnostic -> ActualMissingImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INITIALIZER_REQUIRED_FOR_DESTRUCTURING_DECLARATION) { firDiagnostic -> InitializerRequiredForDestructuringDeclarationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2818,7 +2818,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ComponentFunctionMissingImpl( firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2828,14 +2828,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.COMPONENT_FUNCTION_ON_NULLABLE) { firDiagnostic -> ComponentFunctionOnNullableImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2844,77 +2844,77 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.c), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNINITIALIZED_VARIABLE) { firDiagnostic -> UninitializedVariableImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNINITIALIZED_PARAMETER) { firDiagnostic -> UninitializedParameterImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNINITIALIZED_ENUM_ENTRY) { firDiagnostic -> UninitializedEnumEntryImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNINITIALIZED_ENUM_COMPANION) { firDiagnostic -> UninitializedEnumCompanionImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_REASSIGNMENT) { firDiagnostic -> ValReassignmentImpl( firSymbolBuilder.variableLikeBuilder.buildVariableLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_REASSIGNMENT_VIA_BACKING_FIELD.errorFactory) { firDiagnostic -> ValReassignmentViaBackingFieldErrorImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir.propertySymbol.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VAL_REASSIGNMENT_VIA_BACKING_FIELD.warningFactory) { firDiagnostic -> ValReassignmentViaBackingFieldWarningImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir.propertySymbol.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CAPTURED_VAL_INITIALIZATION) { firDiagnostic -> CapturedValInitializationImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CAPTURED_MEMBER_VAL_INITIALIZATION) { firDiagnostic -> CapturedMemberValInitializationImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SETTER_PROJECTED_OUT) { firDiagnostic -> SetterProjectedOutImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2923,33 +2923,33 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firDiagnostic.b, firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.LEAKED_IN_PLACE_LAMBDA) { firDiagnostic -> LeakedInPlaceLambdaImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.WRONG_IMPLIES_CONDITION) { firDiagnostic -> WrongImpliesConditionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARIABLE_WITH_NO_TYPE_NO_INITIALIZER) { firDiagnostic -> VariableWithNoTypeNoInitializerImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INITIALIZATION_BEFORE_DECLARATION) { firDiagnostic -> InitializationBeforeDeclarationImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2961,7 +2961,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firSourceElement -> (firSourceElement as KtPsiSourceElement).psi }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2969,13 +2969,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert SenselessComparisonImpl( firDiagnostic.a.source!!.psi as KtExpression, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SENSELESS_NULL_IN_WHEN) { firDiagnostic -> SenselessNullInWhenImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2983,14 +2983,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert UnsafeCallImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firDiagnostic.b?.source?.psi as? KtExpression, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNSAFE_IMPLICIT_INVOKE_CALL) { firDiagnostic -> UnsafeImplicitInvokeCallImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -2999,7 +2999,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.source!!.psi as KtExpression, firDiagnostic.b, firDiagnostic.c.source!!.psi as KtExpression, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3008,95 +3008,95 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.source!!.psi as KtExpression, firDiagnostic.b, firDiagnostic.c.source!!.psi as KtExpression, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ITERATOR_ON_NULLABLE) { firDiagnostic -> IteratorOnNullableImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNNECESSARY_SAFE_CALL) { firDiagnostic -> UnnecessarySafeCallImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SAFE_CALL_WILL_CHANGE_NULLABILITY) { firDiagnostic -> SafeCallWillChangeNullabilityImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNEXPECTED_SAFE_CALL) { firDiagnostic -> UnexpectedSafeCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNNECESSARY_NOT_NULL_ASSERTION) { firDiagnostic -> UnnecessaryNotNullAssertionImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION) { firDiagnostic -> NotNullAssertionOnLambdaExpressionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE) { firDiagnostic -> NotNullAssertionOnCallableReferenceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_ELVIS) { firDiagnostic -> UselessElvisImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_ELVIS_RIGHT_IS_NULL) { firDiagnostic -> UselessElvisRightIsNullImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_CAST) { firDiagnostic -> UselessCastImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_IS_CHECK) { firDiagnostic -> UselessIsCheckImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.IS_ENUM_ENTRY) { firDiagnostic -> IsEnumEntryImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ENUM_ENTRY_AS_TYPE) { firDiagnostic -> EnumEntryAsTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPECTED_CONDITION) { firDiagnostic -> ExpectedConditionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3105,7 +3105,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { whenMissingCase -> whenMissingCase }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3115,38 +3115,38 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { whenMissingCase -> whenMissingCase }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INVALID_IF_AS_EXPRESSION) { firDiagnostic -> InvalidIfAsExpressionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ELSE_MISPLACED_IN_WHEN) { firDiagnostic -> ElseMisplacedInWhenImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_DECLARATION_IN_WHEN_SUBJECT) { firDiagnostic -> IllegalDeclarationInWhenSubjectImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT) { firDiagnostic -> CommaInWhenConditionWithoutArgumentImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DUPLICATE_LABEL_IN_WHEN) { firDiagnostic -> DuplicateLabelInWhenImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3165,64 +3165,64 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert add(FirErrors.TYPE_PARAMETER_IS_NOT_AN_EXPRESSION) { firDiagnostic -> TypeParameterIsNotAnExpressionImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPE_PARAMETER_ON_LHS_OF_DOT) { firDiagnostic -> TypeParameterOnLhsOfDotImpl( firSymbolBuilder.classifierBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_COMPANION_OBJECT) { firDiagnostic -> NoCompanionObjectImpl( firSymbolBuilder.classifierBuilder.buildClassLikeSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EXPRESSION_EXPECTED_PACKAGE_FOUND) { firDiagnostic -> ExpressionExpectedPackageFoundImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ERROR_IN_CONTRACT_DESCRIPTION) { firDiagnostic -> ErrorInContractDescriptionImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_GET_METHOD) { firDiagnostic -> NoGetMethodImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_SET_METHOD) { firDiagnostic -> NoSetMethodImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ITERATOR_MISSING) { firDiagnostic -> IteratorMissingImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.HAS_NEXT_MISSING) { firDiagnostic -> HasNextMissingImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NEXT_MISSING) { firDiagnostic -> NextMissingImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3231,7 +3231,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3240,7 +3240,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3249,7 +3249,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firDiagnostic.c, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3259,7 +3259,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3269,7 +3269,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b.map { firBasedSymbol -> firSymbolBuilder.buildSymbol(firBasedSymbol.fir) }, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3278,39 +3278,39 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.c), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNDERSCORE_IS_RESERVED) { firDiagnostic -> UnderscoreIsReservedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNDERSCORE_USAGE_WITHOUT_BACKTICKS) { firDiagnostic -> UnderscoreUsageWithoutBackticksImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RESOLVED_TO_UNDERSCORE_NAMED_CATCH_PARAMETER) { firDiagnostic -> ResolvedToUnderscoreNamedCatchParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INVALID_CHARACTERS) { firDiagnostic -> InvalidCharactersImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DANGEROUS_CHARACTERS) { firDiagnostic -> DangerousCharactersImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3319,7 +3319,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.c), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3328,7 +3328,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.a, firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.c), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3336,13 +3336,13 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert IncompatibleEnumComparisonErrorImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INC_DEC_SHOULD_NOT_RETURN_UNIT) { firDiagnostic -> IncDecShouldNotReturnUnitImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3350,14 +3350,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert AssignmentOperatorShouldReturnUnitImpl( firSymbolBuilder.functionLikeBuilder.buildFunctionSymbol(firDiagnostic.a.fir), firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PROPERTY_AS_OPERATOR) { firDiagnostic -> PropertyAsOperatorImpl( firSymbolBuilder.variableLikeBuilder.buildVariableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3370,122 +3370,122 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.TOPLEVEL_TYPEALIASES_ONLY) { firDiagnostic -> ToplevelTypealiasesOnlyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RECURSIVE_TYPEALIAS_EXPANSION) { firDiagnostic -> RecursiveTypealiasExpansionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.TYPEALIAS_SHOULD_EXPAND_TO_CLASS) { firDiagnostic -> TypealiasShouldExpandToClassImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_VISIBILITY_MODIFIER) { firDiagnostic -> RedundantVisibilityModifierImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_MODALITY_MODIFIER) { firDiagnostic -> RedundantModalityModifierImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_RETURN_UNIT_TYPE) { firDiagnostic -> RedundantReturnUnitTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_EXPLICIT_TYPE) { firDiagnostic -> RedundantExplicitTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_SINGLE_EXPRESSION_STRING_TEMPLATE) { firDiagnostic -> RedundantSingleExpressionStringTemplateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CAN_BE_VAL) { firDiagnostic -> CanBeValImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CAN_BE_REPLACED_WITH_OPERATOR_ASSIGNMENT) { firDiagnostic -> CanBeReplacedWithOperatorAssignmentImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_CALL_OF_CONVERSION_METHOD) { firDiagnostic -> RedundantCallOfConversionMethodImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS) { firDiagnostic -> ArrayEqualityOperatorCanBeReplacedWithEqualsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.EMPTY_RANGE) { firDiagnostic -> EmptyRangeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_SETTER_PARAMETER_TYPE) { firDiagnostic -> RedundantSetterParameterTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.UNUSED_VARIABLE) { firDiagnostic -> UnusedVariableImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ASSIGNED_VALUE_IS_NEVER_READ) { firDiagnostic -> AssignedValueIsNeverReadImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARIABLE_INITIALIZER_IS_REDUNDANT) { firDiagnostic -> VariableInitializerIsRedundantImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.VARIABLE_NEVER_READ) { firDiagnostic -> VariableNeverReadImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USELESS_CALL_ON_NOT_NULL) { firDiagnostic -> UselessCallOnNotNullImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RETURN_NOT_ALLOWED) { firDiagnostic -> ReturnNotAllowedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3497,46 +3497,46 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.RETURN_IN_FUNCTION_WITH_EXPRESSION_BODY) { firDiagnostic -> ReturnInFunctionWithExpressionBodyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY) { firDiagnostic -> NoReturnInFunctionWithBlockBodyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ANONYMOUS_INITIALIZER_IN_INTERFACE) { firDiagnostic -> AnonymousInitializerInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.USAGE_IS_NOT_INLINABLE) { firDiagnostic -> UsageIsNotInlinableImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_LOCAL_RETURN_NOT_ALLOWED) { firDiagnostic -> NonLocalReturnNotAllowedImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOT_YET_SUPPORTED_IN_INLINE) { firDiagnostic -> NotYetSupportedInInlineImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NOTHING_TO_INLINE) { firDiagnostic -> NothingToInlineImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3544,14 +3544,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert NullableInlineParameterImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RECURSION_IN_INLINE) { firDiagnostic -> RecursionInInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3559,7 +3559,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert NonPublicCallFromPublicInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3567,7 +3567,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ProtectedConstructorCallFromPublicInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3575,7 +3575,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ProtectedCallFromPublicInlineErrorImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3583,7 +3583,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert ProtectedCallFromPublicInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3591,32 +3591,32 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert PrivateClassMemberFromInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.SUPER_CALL_FROM_PUBLIC_INLINE) { firDiagnostic -> SuperCallFromPublicInlineImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.DECLARATION_CANT_BE_INLINED) { firDiagnostic -> DeclarationCantBeInlinedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OVERRIDE_BY_INLINE) { firDiagnostic -> OverrideByInlineImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_INTERNAL_PUBLISHED_API) { firDiagnostic -> NonInternalPublishedApiImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3624,192 +3624,192 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert InvalidDefaultFunctionalParameterForInlineImpl( firDiagnostic.a.source!!.psi as KtExpression, firSymbolBuilder.buildSymbol(firDiagnostic.b.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REIFIED_TYPE_PARAMETER_IN_OVERRIDE) { firDiagnostic -> ReifiedTypeParameterInOverrideImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_PROPERTY_WITH_BACKING_FIELD) { firDiagnostic -> InlinePropertyWithBackingFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_INLINE_PARAMETER_MODIFIER) { firDiagnostic -> IllegalInlineParameterModifierImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.INLINE_SUSPEND_FUNCTION_TYPE_UNSUPPORTED) { firDiagnostic -> InlineSuspendFunctionTypeUnsupportedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE) { firDiagnostic -> RedundantInlineSuspendFunctionTypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CANNOT_ALL_UNDER_IMPORT_FROM_SINGLETON) { firDiagnostic -> CannotAllUnderImportFromSingletonImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.PACKAGE_CANNOT_BE_IMPORTED) { firDiagnostic -> PackageCannotBeImportedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CANNOT_BE_IMPORTED) { firDiagnostic -> CannotBeImportedImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.CONFLICTING_IMPORT) { firDiagnostic -> ConflictingImportImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.OPERATOR_RENAMED_ON_IMPORT) { firDiagnostic -> OperatorRenamedOnImportImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_SUSPEND_FUNCTION_CALL) { firDiagnostic -> IllegalSuspendFunctionCallImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_SUSPEND_PROPERTY_ACCESS) { firDiagnostic -> IllegalSuspendPropertyAccessImpl( firSymbolBuilder.buildSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_LOCAL_SUSPENSION_POINT) { firDiagnostic -> NonLocalSuspensionPointImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.ILLEGAL_RESTRICTED_SUSPENDING_FUNCTION_CALL) { firDiagnostic -> IllegalRestrictedSuspendingFunctionCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.NON_MODIFIER_FORM_FOR_BUILT_IN_SUSPEND) { firDiagnostic -> NonModifierFormForBuiltInSuspendImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.MODIFIER_FORM_FOR_NON_BUILT_IN_SUSPEND) { firDiagnostic -> ModifierFormForNonBuiltInSuspendImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.RETURN_FOR_BUILT_IN_SUSPEND) { firDiagnostic -> ReturnForBuiltInSuspendImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirErrors.REDUNDANT_LABEL_WARNING) { firDiagnostic -> RedundantLabelWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.CONFLICTING_JVM_DECLARATIONS) { firDiagnostic -> ConflictingJvmDeclarationsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERRIDE_CANNOT_BE_STATIC) { firDiagnostic -> OverrideCannotBeStaticImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION) { firDiagnostic -> JvmStaticNotInObjectOrClassCompanionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_STATIC_NOT_IN_OBJECT_OR_COMPANION) { firDiagnostic -> JvmStaticNotInObjectOrCompanionImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_STATIC_ON_NON_PUBLIC_MEMBER) { firDiagnostic -> JvmStaticOnNonPublicMemberImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_STATIC_ON_CONST_OR_JVM_FIELD) { firDiagnostic -> JvmStaticOnConstOrJvmFieldImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_STATIC_ON_EXTERNAL_IN_INTERFACE) { firDiagnostic -> JvmStaticOnExternalInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INAPPLICABLE_JVM_NAME) { firDiagnostic -> InapplicableJvmNameImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.ILLEGAL_JVM_NAME) { firDiagnostic -> IllegalJvmNameImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.FUNCTION_DELEGATE_MEMBER_NAME_CLASH) { firDiagnostic -> FunctionDelegateMemberNameClashImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.VALUE_CLASS_WITHOUT_JVM_INLINE_ANNOTATION) { firDiagnostic -> ValueClassWithoutJvmInlineAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_INLINE_WITHOUT_VALUE_CLASS) { firDiagnostic -> JvmInlineWithoutValueClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -3817,275 +3817,275 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert JavaTypeMismatchImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.b), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.UPPER_BOUND_CANNOT_BE_ARRAY) { firDiagnostic -> UpperBoundCannotBeArrayImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.STRICTFP_ON_CLASS) { firDiagnostic -> StrictfpOnClassImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.VOLATILE_ON_VALUE) { firDiagnostic -> VolatileOnValueImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.VOLATILE_ON_DELEGATE) { firDiagnostic -> VolatileOnDelegateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SYNCHRONIZED_ON_ABSTRACT) { firDiagnostic -> SynchronizedOnAbstractImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SYNCHRONIZED_IN_INTERFACE) { firDiagnostic -> SynchronizedInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SYNCHRONIZED_ON_INLINE) { firDiagnostic -> SynchronizedOnInlineImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS) { firDiagnostic -> OverloadsWithoutDefaultArgumentsImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_ABSTRACT) { firDiagnostic -> OverloadsAbstractImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_INTERFACE) { firDiagnostic -> OverloadsInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_LOCAL) { firDiagnostic -> OverloadsLocalImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_ANNOTATION_CLASS_CONSTRUCTOR.errorFactory) { firDiagnostic -> OverloadsAnnotationClassConstructorErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_ANNOTATION_CLASS_CONSTRUCTOR.warningFactory) { firDiagnostic -> OverloadsAnnotationClassConstructorWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.OVERLOADS_PRIVATE) { firDiagnostic -> OverloadsPrivateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.DEPRECATED_JAVA_ANNOTATION) { firDiagnostic -> DeprecatedJavaAnnotationImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_PACKAGE_NAME_CANNOT_BE_EMPTY) { firDiagnostic -> JvmPackageNameCannotBeEmptyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_PACKAGE_NAME_MUST_BE_VALID_NAME) { firDiagnostic -> JvmPackageNameMustBeValidNameImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_PACKAGE_NAME_NOT_SUPPORTED_IN_FILES_WITH_CLASSES) { firDiagnostic -> JvmPackageNameNotSupportedInFilesWithClassesImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION) { firDiagnostic -> PositionedValueArgumentForJavaAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.LOCAL_JVM_RECORD) { firDiagnostic -> LocalJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.NON_FINAL_JVM_RECORD) { firDiagnostic -> NonFinalJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.ENUM_JVM_RECORD) { firDiagnostic -> EnumJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_RECORD_WITHOUT_PRIMARY_CONSTRUCTOR_PARAMETERS) { firDiagnostic -> JvmRecordWithoutPrimaryConstructorParametersImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.NON_DATA_CLASS_JVM_RECORD) { firDiagnostic -> NonDataClassJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_RECORD_NOT_VAL_PARAMETER) { firDiagnostic -> JvmRecordNotValParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_RECORD_NOT_LAST_VARARG_PARAMETER) { firDiagnostic -> JvmRecordNotLastVarargParameterImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INNER_JVM_RECORD) { firDiagnostic -> InnerJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.FIELD_IN_JVM_RECORD) { firDiagnostic -> FieldInJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.DELEGATION_BY_IN_JVM_RECORD) { firDiagnostic -> DelegationByInJvmRecordImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_RECORD_EXTENDS_CLASS) { firDiagnostic -> JvmRecordExtendsClassImpl( firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.ILLEGAL_JAVA_LANG_RECORD_SUPERTYPE) { firDiagnostic -> IllegalJavaLangRecordSupertypeImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_DEFAULT_NOT_IN_INTERFACE) { firDiagnostic -> JvmDefaultNotInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_DEFAULT_IN_JVM6_TARGET) { firDiagnostic -> JvmDefaultInJvm6TargetImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_DEFAULT_REQUIRED_FOR_OVERRIDE) { firDiagnostic -> JvmDefaultRequiredForOverrideImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_DEFAULT_IN_DECLARATION) { firDiagnostic -> JvmDefaultInDeclarationImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_DEFAULT_THROUGH_INHERITANCE) { firDiagnostic -> JvmDefaultThroughInheritanceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.USAGE_OF_JVM_DEFAULT_THROUGH_SUPER_CALL) { firDiagnostic -> UsageOfJvmDefaultThroughSuperCallImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT) { firDiagnostic -> NonJvmDefaultOverridesJavaDefaultImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.EXTERNAL_DECLARATION_CANNOT_BE_ABSTRACT) { firDiagnostic -> ExternalDeclarationCannotBeAbstractImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.EXTERNAL_DECLARATION_CANNOT_HAVE_BODY) { firDiagnostic -> ExternalDeclarationCannotHaveBodyImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.EXTERNAL_DECLARATION_IN_INTERFACE) { firDiagnostic -> ExternalDeclarationInInterfaceImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.EXTERNAL_DECLARATION_CANNOT_BE_INLINED) { firDiagnostic -> ExternalDeclarationCannotBeInlinedImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.NON_SOURCE_REPEATED_ANNOTATION) { firDiagnostic -> NonSourceRepeatedAnnotationImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.REPEATED_ANNOTATION_TARGET6) { firDiagnostic -> RepeatedAnnotationTarget6Impl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4093,7 +4093,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatedAnnotationWithContainerImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4101,7 +4101,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerMustHaveValueArrayErrorImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4109,7 +4109,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerMustHaveValueArrayWarningImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4117,7 +4117,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerHasNonDefaultParameterErrorImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4125,7 +4125,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerHasNonDefaultParameterWarningImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4135,7 +4135,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b, firDiagnostic.c, firDiagnostic.d, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4145,7 +4145,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert firDiagnostic.b, firDiagnostic.c, firDiagnostic.d, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4153,7 +4153,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerTargetSetNotASubsetErrorImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } @@ -4161,100 +4161,100 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert RepeatableContainerTargetSetNotASubsetWarningImpl( firDiagnostic.a, firDiagnostic.b, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.REPEATABLE_ANNOTATION_HAS_NESTED_CLASS_NAMED_CONTAINER.errorFactory) { firDiagnostic -> RepeatableAnnotationHasNestedClassNamedContainerErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.REPEATABLE_ANNOTATION_HAS_NESTED_CLASS_NAMED_CONTAINER.warningFactory) { firDiagnostic -> RepeatableAnnotationHasNestedClassNamedContainerWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SUSPENSION_POINT_INSIDE_CRITICAL_SECTION) { firDiagnostic -> SuspensionPointInsideCriticalSectionImpl( firSymbolBuilder.callableBuilder.buildCallableSymbol(firDiagnostic.a.fir), - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INAPPLICABLE_JVM_FIELD) { firDiagnostic -> InapplicableJvmFieldImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INAPPLICABLE_JVM_FIELD_WARNING) { firDiagnostic -> InapplicableJvmFieldWarningImpl( firDiagnostic.a, - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.JVM_SYNTHETIC_ON_DELEGATE) { firDiagnostic -> JvmSyntheticOnDelegateImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET.errorFactory) { firDiagnostic -> DefaultMethodCallFromJava6TargetErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET.warningFactory) { firDiagnostic -> DefaultMethodCallFromJava6TargetWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET.errorFactory) { firDiagnostic -> InterfaceStaticMethodCallFromJava6TargetErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET.warningFactory) { firDiagnostic -> InterfaceStaticMethodCallFromJava6TargetWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC) { firDiagnostic -> SubclassCantCallCompanionProtectedNonStaticImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR.errorFactory) { firDiagnostic -> ConcurrentHashMapContainsOperatorErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR.warningFactory) { firDiagnostic -> ConcurrentHashMapContainsOperatorWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL.errorFactory) { firDiagnostic -> SpreadOnSignaturePolymorphicCallErrorImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } add(FirJvmErrors.SPREAD_ON_SIGNATURE_POLYMORPHIC_CALL.warningFactory) { firDiagnostic -> SpreadOnSignaturePolymorphicCallWarningImpl( - firDiagnostic as FirPsiDiagnostic, + firDiagnostic as KtPsiDiagnostic, token, ) } diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt index 2a8dfd612db..0043615a97f 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt @@ -7,13 +7,7 @@ package org.jetbrains.kotlin.analysis.api.fir.diagnostics import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSymbol -import org.jetbrains.kotlin.analysis.api.symbols.KtVariableSymbol +import org.jetbrains.kotlin.analysis.api.symbols.* import org.jetbrains.kotlin.analysis.api.tokens.ValidityToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.config.LanguageFeature @@ -24,7 +18,7 @@ import org.jetbrains.kotlin.descriptors.EffectiveVisibility import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.diagnostics.WhenMissingCase import org.jetbrains.kotlin.fir.FirModuleData -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.lexer.KtKeywordToken import org.jetbrains.kotlin.lexer.KtModifierKeywordToken @@ -89,149 +83,149 @@ import org.jetbrains.kotlin.types.Variance internal class UnsupportedImpl( override val unsupported: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.Unsupported(), KtAbstractFirDiagnostic internal class UnsupportedFeatureImpl( override val unsupportedFeature: Pair, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnsupportedFeature(), KtAbstractFirDiagnostic internal class NewInferenceErrorImpl( override val error: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NewInferenceError(), KtAbstractFirDiagnostic internal class SyntaxImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.Syntax(), KtAbstractFirDiagnostic internal class OtherErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OtherError(), KtAbstractFirDiagnostic internal class IllegalConstExpressionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalConstExpression(), KtAbstractFirDiagnostic internal class IllegalUnderscoreImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalUnderscore(), KtAbstractFirDiagnostic internal class ExpressionExpectedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpressionExpected(), KtAbstractFirDiagnostic internal class AssignmentInExpressionContextImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssignmentInExpressionContext(), KtAbstractFirDiagnostic internal class BreakOrContinueOutsideALoopImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BreakOrContinueOutsideALoop(), KtAbstractFirDiagnostic internal class NotALoopLabelImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotALoopLabel(), KtAbstractFirDiagnostic internal class BreakOrContinueJumpsAcrossFunctionBoundaryImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BreakOrContinueJumpsAcrossFunctionBoundary(), KtAbstractFirDiagnostic internal class VariableExpectedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VariableExpected(), KtAbstractFirDiagnostic internal class DelegationInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegationInInterface(), KtAbstractFirDiagnostic internal class DelegationNotToInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegationNotToInterface(), KtAbstractFirDiagnostic internal class NestedClassNotAllowedImpl( override val declaration: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NestedClassNotAllowed(), KtAbstractFirDiagnostic internal class IncorrectCharacterLiteralImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncorrectCharacterLiteral(), KtAbstractFirDiagnostic internal class EmptyCharacterLiteralImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EmptyCharacterLiteral(), KtAbstractFirDiagnostic internal class TooManyCharactersInCharacterLiteralImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TooManyCharactersInCharacterLiteral(), KtAbstractFirDiagnostic internal class IllegalEscapeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalEscape(), KtAbstractFirDiagnostic internal class IntLiteralOutOfRangeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IntLiteralOutOfRange(), KtAbstractFirDiagnostic internal class FloatLiteralOutOfRangeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FloatLiteralOutOfRange(), KtAbstractFirDiagnostic internal class WrongLongSuffixImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongLongSuffix(), KtAbstractFirDiagnostic internal class DivisionByZeroImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DivisionByZero(), KtAbstractFirDiagnostic internal class ValOrVarOnLoopParameterImpl( override val valOrVar: KtKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValOrVarOnLoopParameter(), KtAbstractFirDiagnostic internal class ValOrVarOnFunParameterImpl( override val valOrVar: KtKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValOrVarOnFunParameter(), KtAbstractFirDiagnostic internal class ValOrVarOnCatchParameterImpl( override val valOrVar: KtKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValOrVarOnCatchParameter(), KtAbstractFirDiagnostic internal class ValOrVarOnSecondaryConstructorParameterImpl( override val valOrVar: KtKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValOrVarOnSecondaryConstructorParameter(), KtAbstractFirDiagnostic @@ -245,93 +239,93 @@ internal class InvisibleSetterImpl( internal class InvisibleReferenceImpl( override val reference: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvisibleReference(), KtAbstractFirDiagnostic internal class UnresolvedReferenceImpl( override val reference: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnresolvedReference(), KtAbstractFirDiagnostic internal class UnresolvedLabelImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnresolvedLabel(), KtAbstractFirDiagnostic internal class DeserializationErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeserializationError(), KtAbstractFirDiagnostic internal class ErrorFromJavaResolutionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ErrorFromJavaResolution(), KtAbstractFirDiagnostic internal class MissingStdlibClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MissingStdlibClass(), KtAbstractFirDiagnostic internal class NoThisImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoThis(), KtAbstractFirDiagnostic internal class DeprecationErrorImpl( override val reference: KtSymbol, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecationError(), KtAbstractFirDiagnostic internal class DeprecationImpl( override val reference: KtSymbol, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.Deprecation(), KtAbstractFirDiagnostic internal class UnresolvedReferenceWrongReceiverImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnresolvedReferenceWrongReceiver(), KtAbstractFirDiagnostic internal class CreatingAnInstanceOfAbstractClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CreatingAnInstanceOfAbstractClass(), KtAbstractFirDiagnostic internal class FunctionCallExpectedImpl( override val functionName: String, override val hasValueParameters: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunctionCallExpected(), KtAbstractFirDiagnostic internal class IllegalSelectorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalSelector(), KtAbstractFirDiagnostic internal class NoReceiverAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoReceiverAllowed(), KtAbstractFirDiagnostic internal class FunctionExpectedImpl( override val expression: String, override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunctionExpected(), KtAbstractFirDiagnostic internal class ResolutionToClassifierImpl( override val classSymbol: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ResolutionToClassifier(), KtAbstractFirDiagnostic @@ -358,133 +352,133 @@ internal class InstanceAccessBeforeSuperCallImpl( internal class SuperCallWithDefaultParametersImpl( override val name: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuperCallWithDefaultParameters(), KtAbstractFirDiagnostic internal class InterfaceCantCallDefaultMethodViaSuperImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InterfaceCantCallDefaultMethodViaSuper(), KtAbstractFirDiagnostic internal class NotASupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotASupertype(), KtAbstractFirDiagnostic internal class TypeArgumentsRedundantInSuperQualifierImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeArgumentsRedundantInSuperQualifier(), KtAbstractFirDiagnostic internal class SuperclassNotAccessibleFromInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuperclassNotAccessibleFromInterface(), KtAbstractFirDiagnostic internal class QualifiedSupertypeExtendedByOtherSupertypeImpl( override val otherSuperType: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.QualifiedSupertypeExtendedByOtherSupertype(), KtAbstractFirDiagnostic internal class SupertypeInitializedInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeInitializedInInterface(), KtAbstractFirDiagnostic internal class InterfaceWithSuperclassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InterfaceWithSuperclass(), KtAbstractFirDiagnostic internal class FinalSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FinalSupertype(), KtAbstractFirDiagnostic internal class ClassCannotBeExtendedDirectlyImpl( override val classSymbol: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ClassCannotBeExtendedDirectly(), KtAbstractFirDiagnostic internal class SupertypeIsExtensionFunctionTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeIsExtensionFunctionType(), KtAbstractFirDiagnostic internal class SingletonInSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SingletonInSupertype(), KtAbstractFirDiagnostic internal class NullableSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NullableSupertype(), KtAbstractFirDiagnostic internal class ManyClassesInSupertypeListImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ManyClassesInSupertypeList(), KtAbstractFirDiagnostic internal class SupertypeAppearsTwiceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeAppearsTwice(), KtAbstractFirDiagnostic internal class ClassInSupertypeForEnumImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ClassInSupertypeForEnum(), KtAbstractFirDiagnostic internal class SealedSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SealedSupertype(), KtAbstractFirDiagnostic internal class SealedSupertypeInLocalClassImpl( override val declarationType: String, override val sealedClassKind: ClassKind, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SealedSupertypeInLocalClass(), KtAbstractFirDiagnostic internal class SealedInheritorInDifferentPackageImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SealedInheritorInDifferentPackage(), KtAbstractFirDiagnostic internal class SealedInheritorInDifferentModuleImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SealedInheritorInDifferentModule(), KtAbstractFirDiagnostic internal class ClassInheritsJavaSealedClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ClassInheritsJavaSealedClass(), KtAbstractFirDiagnostic internal class SupertypeNotAClassOrInterfaceImpl( override val reason: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeNotAClassOrInterface(), KtAbstractFirDiagnostic internal class CyclicInheritanceHierarchyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CyclicInheritanceHierarchy(), KtAbstractFirDiagnostic internal class ExpandedTypeCannotBeInheritedImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpandedTypeCannotBeInherited(), KtAbstractFirDiagnostic internal class ProjectionInImmediateArgumentToSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ProjectionInImmediateArgumentToSupertype(), KtAbstractFirDiagnostic @@ -492,7 +486,7 @@ internal class InconsistentTypeParameterValuesImpl( override val typeParameter: KtTypeParameterSymbol, override val type: KtClassLikeSymbol, override val bounds: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InconsistentTypeParameterValues(), KtAbstractFirDiagnostic @@ -500,358 +494,358 @@ internal class InconsistentTypeParameterBoundsImpl( override val typeParameter: KtTypeParameterSymbol, override val type: KtClassLikeSymbol, override val bounds: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InconsistentTypeParameterBounds(), KtAbstractFirDiagnostic internal class AmbiguousSuperImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AmbiguousSuper(), KtAbstractFirDiagnostic internal class ConstructorInObjectImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstructorInObject(), KtAbstractFirDiagnostic internal class ConstructorInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstructorInInterface(), KtAbstractFirDiagnostic internal class NonPrivateConstructorInEnumImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonPrivateConstructorInEnum(), KtAbstractFirDiagnostic internal class NonPrivateOrProtectedConstructorInSealedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonPrivateOrProtectedConstructorInSealed(), KtAbstractFirDiagnostic internal class CyclicConstructorDelegationCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CyclicConstructorDelegationCall(), KtAbstractFirDiagnostic internal class PrimaryConstructorDelegationCallExpectedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrimaryConstructorDelegationCallExpected(), KtAbstractFirDiagnostic internal class SupertypeNotInitializedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeNotInitialized(), KtAbstractFirDiagnostic internal class SupertypeInitializedWithoutPrimaryConstructorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeInitializedWithoutPrimaryConstructor(), KtAbstractFirDiagnostic internal class DelegationSuperCallInEnumConstructorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegationSuperCallInEnumConstructor(), KtAbstractFirDiagnostic internal class PrimaryConstructorRequiredForDataClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrimaryConstructorRequiredForDataClass(), KtAbstractFirDiagnostic internal class ExplicitDelegationCallRequiredImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExplicitDelegationCallRequired(), KtAbstractFirDiagnostic internal class SealedClassConstructorCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SealedClassConstructorCall(), KtAbstractFirDiagnostic internal class DataClassWithoutParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DataClassWithoutParameters(), KtAbstractFirDiagnostic internal class DataClassVarargParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DataClassVarargParameter(), KtAbstractFirDiagnostic internal class DataClassNotPropertyParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DataClassNotPropertyParameter(), KtAbstractFirDiagnostic internal class AnnotationArgumentKclassLiteralOfTypeParameterErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationArgumentKclassLiteralOfTypeParameterError(), KtAbstractFirDiagnostic internal class AnnotationArgumentMustBeConstImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationArgumentMustBeConst(), KtAbstractFirDiagnostic internal class AnnotationArgumentMustBeEnumConstImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationArgumentMustBeEnumConst(), KtAbstractFirDiagnostic internal class AnnotationArgumentMustBeKclassLiteralImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationArgumentMustBeKclassLiteral(), KtAbstractFirDiagnostic internal class AnnotationClassMemberImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationClassMember(), KtAbstractFirDiagnostic internal class AnnotationParameterDefaultValueMustBeConstantImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationParameterDefaultValueMustBeConstant(), KtAbstractFirDiagnostic internal class InvalidTypeOfAnnotationMemberImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvalidTypeOfAnnotationMember(), KtAbstractFirDiagnostic internal class LocalAnnotationClassErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalAnnotationClassError(), KtAbstractFirDiagnostic internal class MissingValOnAnnotationParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MissingValOnAnnotationParameter(), KtAbstractFirDiagnostic internal class NonConstValUsedInConstantExpressionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonConstValUsedInConstantExpression(), KtAbstractFirDiagnostic internal class AnnotationClassConstructorCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationClassConstructorCall(), KtAbstractFirDiagnostic internal class NotAnAnnotationClassImpl( override val annotationName: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotAnAnnotationClass(), KtAbstractFirDiagnostic internal class NullableTypeOfAnnotationMemberImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NullableTypeOfAnnotationMember(), KtAbstractFirDiagnostic internal class VarAnnotationParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarAnnotationParameter(), KtAbstractFirDiagnostic internal class SupertypesForAnnotationClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypesForAnnotationClass(), KtAbstractFirDiagnostic internal class AnnotationUsedAsAnnotationArgumentImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationUsedAsAnnotationArgument(), KtAbstractFirDiagnostic internal class IllegalKotlinVersionStringValueImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalKotlinVersionStringValue(), KtAbstractFirDiagnostic internal class NewerVersionInSinceKotlinImpl( override val specifiedVersion: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NewerVersionInSinceKotlin(), KtAbstractFirDiagnostic internal class DeprecatedSinceKotlinWithUnorderedVersionsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedSinceKotlinWithUnorderedVersions(), KtAbstractFirDiagnostic internal class DeprecatedSinceKotlinWithoutArgumentsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedSinceKotlinWithoutArguments(), KtAbstractFirDiagnostic internal class DeprecatedSinceKotlinWithoutDeprecatedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedSinceKotlinWithoutDeprecated(), KtAbstractFirDiagnostic internal class DeprecatedSinceKotlinWithDeprecatedLevelImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedSinceKotlinWithDeprecatedLevel(), KtAbstractFirDiagnostic internal class DeprecatedSinceKotlinOutsideKotlinSubpackageImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedSinceKotlinOutsideKotlinSubpackage(), KtAbstractFirDiagnostic internal class OverrideDeprecationImpl( override val overridenSymbol: KtSymbol, override val deprecationInfo: DeprecationInfo, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverrideDeprecation(), KtAbstractFirDiagnostic internal class AnnotationOnSuperclassErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationOnSuperclassError(), KtAbstractFirDiagnostic internal class AnnotationOnSuperclassWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnnotationOnSuperclassWarning(), KtAbstractFirDiagnostic internal class RestrictedRetentionForExpressionAnnotationErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RestrictedRetentionForExpressionAnnotationError(), KtAbstractFirDiagnostic internal class RestrictedRetentionForExpressionAnnotationWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RestrictedRetentionForExpressionAnnotationWarning(), KtAbstractFirDiagnostic internal class WrongAnnotationTargetImpl( override val actualTarget: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongAnnotationTarget(), KtAbstractFirDiagnostic internal class WrongAnnotationTargetWithUseSiteTargetImpl( override val actualTarget: String, override val useSiteTarget: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongAnnotationTargetWithUseSiteTarget(), KtAbstractFirDiagnostic internal class InapplicableTargetOnPropertyImpl( override val useSiteDescription: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableTargetOnProperty(), KtAbstractFirDiagnostic internal class InapplicableTargetPropertyImmutableImpl( override val useSiteDescription: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableTargetPropertyImmutable(), KtAbstractFirDiagnostic internal class InapplicableTargetPropertyHasNoDelegateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableTargetPropertyHasNoDelegate(), KtAbstractFirDiagnostic internal class InapplicableTargetPropertyHasNoBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableTargetPropertyHasNoBackingField(), KtAbstractFirDiagnostic internal class InapplicableParamTargetImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableParamTarget(), KtAbstractFirDiagnostic internal class RedundantAnnotationTargetImpl( override val useSiteDescription: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantAnnotationTarget(), KtAbstractFirDiagnostic internal class InapplicableFileTargetImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableFileTarget(), KtAbstractFirDiagnostic internal class RepeatedAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedAnnotation(), KtAbstractFirDiagnostic internal class RepeatedAnnotationWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedAnnotationWarning(), KtAbstractFirDiagnostic internal class OptInUsageImpl( override val optInMarkerFqName: FqName, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInUsage(), KtAbstractFirDiagnostic internal class OptInUsageErrorImpl( override val optInMarkerFqName: FqName, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInUsageError(), KtAbstractFirDiagnostic internal class OptInOverrideImpl( override val optInMarkerFqName: FqName, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInOverride(), KtAbstractFirDiagnostic internal class OptInOverrideErrorImpl( override val optInMarkerFqName: FqName, override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInOverrideError(), KtAbstractFirDiagnostic internal class OptInIsNotEnabledImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInIsNotEnabled(), KtAbstractFirDiagnostic internal class OptInCanOnlyBeUsedAsAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInCanOnlyBeUsedAsAnnotation(), KtAbstractFirDiagnostic internal class OptInMarkerCanOnlyBeUsedAsAnnotationOrArgumentInOptInImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerCanOnlyBeUsedAsAnnotationOrArgumentInOptIn(), KtAbstractFirDiagnostic internal class OptInWithoutArgumentsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInWithoutArguments(), KtAbstractFirDiagnostic internal class OptInArgumentIsNotMarkerImpl( override val notMarkerFqName: FqName, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInArgumentIsNotMarker(), KtAbstractFirDiagnostic internal class OptInMarkerWithWrongTargetImpl( override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerWithWrongTarget(), KtAbstractFirDiagnostic internal class OptInMarkerWithWrongRetentionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OptInMarkerWithWrongRetention(), KtAbstractFirDiagnostic @@ -875,7 +869,7 @@ internal class ExposedTypealiasExpandedTypeImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedTypealiasExpandedType(), KtAbstractFirDiagnostic @@ -883,7 +877,7 @@ internal class ExposedFunctionReturnTypeImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedFunctionReturnType(), KtAbstractFirDiagnostic @@ -891,7 +885,7 @@ internal class ExposedReceiverTypeImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedReceiverType(), KtAbstractFirDiagnostic @@ -899,7 +893,7 @@ internal class ExposedPropertyTypeImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedPropertyType(), KtAbstractFirDiagnostic @@ -907,7 +901,7 @@ internal class ExposedPropertyTypeInConstructorErrorImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedPropertyTypeInConstructorError(), KtAbstractFirDiagnostic @@ -915,7 +909,7 @@ internal class ExposedPropertyTypeInConstructorWarningImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedPropertyTypeInConstructorWarning(), KtAbstractFirDiagnostic @@ -923,7 +917,7 @@ internal class ExposedParameterTypeImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedParameterType(), KtAbstractFirDiagnostic @@ -931,7 +925,7 @@ internal class ExposedSuperInterfaceImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedSuperInterface(), KtAbstractFirDiagnostic @@ -939,7 +933,7 @@ internal class ExposedSuperClassImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedSuperClass(), KtAbstractFirDiagnostic @@ -947,214 +941,214 @@ internal class ExposedTypeParameterBoundImpl( override val elementVisibility: EffectiveVisibility, override val restrictingDeclaration: KtSymbol, override val restrictingVisibility: EffectiveVisibility, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExposedTypeParameterBound(), KtAbstractFirDiagnostic internal class InapplicableInfixModifierImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableInfixModifier(), KtAbstractFirDiagnostic internal class RepeatedModifierImpl( override val modifier: KtModifierKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedModifier(), KtAbstractFirDiagnostic internal class RedundantModifierImpl( override val redundantModifier: KtModifierKeywordToken, override val conflictingModifier: KtModifierKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantModifier(), KtAbstractFirDiagnostic internal class DeprecatedModifierImpl( override val deprecatedModifier: KtModifierKeywordToken, override val actualModifier: KtModifierKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedModifier(), KtAbstractFirDiagnostic internal class DeprecatedModifierPairImpl( override val deprecatedModifier: KtModifierKeywordToken, override val conflictingModifier: KtModifierKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedModifierPair(), KtAbstractFirDiagnostic internal class DeprecatedModifierForTargetImpl( override val deprecatedModifier: KtModifierKeywordToken, override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedModifierForTarget(), KtAbstractFirDiagnostic internal class RedundantModifierForTargetImpl( override val redundantModifier: KtModifierKeywordToken, override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantModifierForTarget(), KtAbstractFirDiagnostic internal class IncompatibleModifiersImpl( override val modifier1: KtModifierKeywordToken, override val modifier2: KtModifierKeywordToken, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncompatibleModifiers(), KtAbstractFirDiagnostic internal class RedundantOpenInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantOpenInInterface(), KtAbstractFirDiagnostic internal class WrongModifierTargetImpl( override val modifier: KtModifierKeywordToken, override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongModifierTarget(), KtAbstractFirDiagnostic internal class OperatorModifierRequiredImpl( override val functionSymbol: KtFunctionLikeSymbol, override val name: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OperatorModifierRequired(), KtAbstractFirDiagnostic internal class InfixModifierRequiredImpl( override val functionSymbol: KtFunctionLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InfixModifierRequired(), KtAbstractFirDiagnostic internal class WrongModifierContainingDeclarationImpl( override val modifier: KtModifierKeywordToken, override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongModifierContainingDeclaration(), KtAbstractFirDiagnostic internal class DeprecatedModifierContainingDeclarationImpl( override val modifier: KtModifierKeywordToken, override val target: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedModifierContainingDeclaration(), KtAbstractFirDiagnostic internal class InapplicableOperatorModifierImpl( override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableOperatorModifier(), KtAbstractFirDiagnostic internal class NoExplicitVisibilityInApiModeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoExplicitVisibilityInApiMode(), KtAbstractFirDiagnostic internal class NoExplicitVisibilityInApiModeWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoExplicitVisibilityInApiModeWarning(), KtAbstractFirDiagnostic internal class NoExplicitReturnTypeInApiModeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoExplicitReturnTypeInApiMode(), KtAbstractFirDiagnostic internal class NoExplicitReturnTypeInApiModeWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoExplicitReturnTypeInApiModeWarning(), KtAbstractFirDiagnostic internal class InlineClassNotTopLevelImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassNotTopLevel(), KtAbstractFirDiagnostic internal class InlineClassNotFinalImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassNotFinal(), KtAbstractFirDiagnostic internal class AbsenceOfPrimaryConstructorForInlineClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbsenceOfPrimaryConstructorForInlineClass(), KtAbstractFirDiagnostic internal class InlineClassConstructorWrongParametersSizeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassConstructorWrongParametersSize(), KtAbstractFirDiagnostic internal class InlineClassConstructorNotFinalReadOnlyParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassConstructorNotFinalReadOnlyParameter(), KtAbstractFirDiagnostic internal class PropertyWithBackingFieldInsideInlineClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyWithBackingFieldInsideInlineClass(), KtAbstractFirDiagnostic internal class DelegatedPropertyInsideInlineClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegatedPropertyInsideInlineClass(), KtAbstractFirDiagnostic internal class InlineClassHasInapplicableParameterTypeImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassHasInapplicableParameterType(), KtAbstractFirDiagnostic internal class InlineClassCannotImplementInterfaceByDelegationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassCannotImplementInterfaceByDelegation(), KtAbstractFirDiagnostic internal class InlineClassCannotExtendClassesImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassCannotExtendClasses(), KtAbstractFirDiagnostic internal class InlineClassCannotBeRecursiveImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineClassCannotBeRecursive(), KtAbstractFirDiagnostic internal class ReservedMemberInsideInlineClassImpl( override val name: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReservedMemberInsideInlineClass(), KtAbstractFirDiagnostic internal class SecondaryConstructorWithBodyInsideInlineClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SecondaryConstructorWithBodyInsideInlineClass(), KtAbstractFirDiagnostic internal class InnerClassInsideInlineClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InnerClassInsideInlineClass(), KtAbstractFirDiagnostic internal class ValueClassCannotBeCloneableImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValueClassCannotBeCloneable(), KtAbstractFirDiagnostic internal class NoneApplicableImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoneApplicable(), KtAbstractFirDiagnostic internal class InapplicableCandidateImpl( override val candidate: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableCandidate(), KtAbstractFirDiagnostic @@ -1162,21 +1156,21 @@ internal class TypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeMismatch(), KtAbstractFirDiagnostic internal class ThrowableTypeMismatchImpl( override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ThrowableTypeMismatch(), KtAbstractFirDiagnostic internal class ConditionTypeMismatchImpl( override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConditionTypeMismatch(), KtAbstractFirDiagnostic @@ -1184,57 +1178,57 @@ internal class ArgumentTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ArgumentTypeMismatch(), KtAbstractFirDiagnostic internal class NullForNonnullTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NullForNonnullType(), KtAbstractFirDiagnostic internal class InapplicableLateinitModifierImpl( override val reason: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableLateinitModifier(), KtAbstractFirDiagnostic internal class VarargOutsideParenthesesImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarargOutsideParentheses(), KtAbstractFirDiagnostic internal class NamedArgumentsNotAllowedImpl( override val forbiddenNamedArgumentsTarget: ForbiddenNamedArgumentsTarget, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NamedArgumentsNotAllowed(), KtAbstractFirDiagnostic internal class NonVarargSpreadImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonVarargSpread(), KtAbstractFirDiagnostic internal class ArgumentPassedTwiceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ArgumentPassedTwice(), KtAbstractFirDiagnostic internal class TooManyArgumentsImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TooManyArguments(), KtAbstractFirDiagnostic internal class NoValueForParameterImpl( override val violatedParameter: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoValueForParameter(), KtAbstractFirDiagnostic internal class NamedParameterNotFoundImpl( override val name: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NamedParameterNotFound(), KtAbstractFirDiagnostic @@ -1242,301 +1236,301 @@ internal class AssignmentTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssignmentTypeMismatch(), KtAbstractFirDiagnostic internal class ResultTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ResultTypeMismatch(), KtAbstractFirDiagnostic internal class ManyLambdaExpressionArgumentsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ManyLambdaExpressionArguments(), KtAbstractFirDiagnostic internal class NewInferenceNoInformationForParameterImpl( override val name: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NewInferenceNoInformationForParameter(), KtAbstractFirDiagnostic internal class SpreadOfNullableImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SpreadOfNullable(), KtAbstractFirDiagnostic internal class AssigningSingleElementToVarargInNamedFormFunctionErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssigningSingleElementToVarargInNamedFormFunctionError(), KtAbstractFirDiagnostic internal class AssigningSingleElementToVarargInNamedFormFunctionWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssigningSingleElementToVarargInNamedFormFunctionWarning(), KtAbstractFirDiagnostic internal class AssigningSingleElementToVarargInNamedFormAnnotationErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssigningSingleElementToVarargInNamedFormAnnotationError(), KtAbstractFirDiagnostic internal class AssigningSingleElementToVarargInNamedFormAnnotationWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssigningSingleElementToVarargInNamedFormAnnotationWarning(), KtAbstractFirDiagnostic internal class RedundantSpreadOperatorInNamedFormInAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantSpreadOperatorInNamedFormInAnnotation(), KtAbstractFirDiagnostic internal class RedundantSpreadOperatorInNamedFormInFunctionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantSpreadOperatorInNamedFormInFunction(), KtAbstractFirDiagnostic internal class OverloadResolutionAmbiguityImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadResolutionAmbiguity(), KtAbstractFirDiagnostic internal class AssignOperatorAmbiguityImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssignOperatorAmbiguity(), KtAbstractFirDiagnostic internal class IteratorAmbiguityImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IteratorAmbiguity(), KtAbstractFirDiagnostic internal class HasNextFunctionAmbiguityImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.HasNextFunctionAmbiguity(), KtAbstractFirDiagnostic internal class NextAmbiguityImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NextAmbiguity(), KtAbstractFirDiagnostic internal class RecursionInImplicitTypesImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RecursionInImplicitTypes(), KtAbstractFirDiagnostic internal class InferenceErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InferenceError(), KtAbstractFirDiagnostic internal class ProjectionOnNonClassTypeArgumentImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ProjectionOnNonClassTypeArgument(), KtAbstractFirDiagnostic internal class UpperBoundViolatedImpl( override val expectedUpperBound: KtType, override val actualUpperBound: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UpperBoundViolated(), KtAbstractFirDiagnostic internal class UpperBoundViolatedInTypealiasExpansionImpl( override val expectedUpperBound: KtType, override val actualUpperBound: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UpperBoundViolatedInTypealiasExpansion(), KtAbstractFirDiagnostic internal class TypeArgumentsNotAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeArgumentsNotAllowed(), KtAbstractFirDiagnostic internal class WrongNumberOfTypeArgumentsImpl( override val expectedCount: Int, override val classifier: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongNumberOfTypeArguments(), KtAbstractFirDiagnostic internal class NoTypeArgumentsOnRhsImpl( override val expectedCount: Int, override val classifier: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoTypeArgumentsOnRhs(), KtAbstractFirDiagnostic internal class OuterClassArgumentsRequiredImpl( override val outer: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OuterClassArgumentsRequired(), KtAbstractFirDiagnostic internal class TypeParametersInObjectImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParametersInObject(), KtAbstractFirDiagnostic internal class TypeParametersInAnonymousObjectImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParametersInAnonymousObject(), KtAbstractFirDiagnostic internal class IllegalProjectionUsageImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalProjectionUsage(), KtAbstractFirDiagnostic internal class TypeParametersInEnumImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParametersInEnum(), KtAbstractFirDiagnostic internal class ConflictingProjectionImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingProjection(), KtAbstractFirDiagnostic internal class ConflictingProjectionInTypealiasExpansionImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingProjectionInTypealiasExpansion(), KtAbstractFirDiagnostic internal class RedundantProjectionImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantProjection(), KtAbstractFirDiagnostic internal class VarianceOnTypeParameterNotAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarianceOnTypeParameterNotAllowed(), KtAbstractFirDiagnostic internal class CatchParameterWithDefaultValueImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CatchParameterWithDefaultValue(), KtAbstractFirDiagnostic internal class ReifiedTypeInCatchClauseImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReifiedTypeInCatchClause(), KtAbstractFirDiagnostic internal class TypeParameterInCatchClauseImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterInCatchClause(), KtAbstractFirDiagnostic internal class GenericThrowableSubclassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.GenericThrowableSubclass(), KtAbstractFirDiagnostic internal class InnerClassOfGenericThrowableSubclassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InnerClassOfGenericThrowableSubclass(), KtAbstractFirDiagnostic internal class KclassWithNullableTypeParameterInSignatureImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.KclassWithNullableTypeParameterInSignature(), KtAbstractFirDiagnostic internal class TypeParameterAsReifiedImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterAsReified(), KtAbstractFirDiagnostic internal class TypeParameterAsReifiedArrayErrorImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterAsReifiedArrayError(), KtAbstractFirDiagnostic internal class TypeParameterAsReifiedArrayWarningImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterAsReifiedArrayWarning(), KtAbstractFirDiagnostic internal class ReifiedTypeForbiddenSubstitutionImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReifiedTypeForbiddenSubstitution(), KtAbstractFirDiagnostic internal class FinalUpperBoundImpl( override val type: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FinalUpperBound(), KtAbstractFirDiagnostic internal class UpperBoundIsExtensionFunctionTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UpperBoundIsExtensionFunctionType(), KtAbstractFirDiagnostic internal class BoundsNotAllowedIfBoundedByTypeParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BoundsNotAllowedIfBoundedByTypeParameter(), KtAbstractFirDiagnostic internal class OnlyOneClassBoundAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OnlyOneClassBoundAllowed(), KtAbstractFirDiagnostic internal class RepeatedBoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedBound(), KtAbstractFirDiagnostic internal class ConflictingUpperBoundsImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingUpperBounds(), KtAbstractFirDiagnostic internal class NameInConstraintIsNotATypeParameterImpl( override val typeParameterName: Name, override val typeParametersOwner: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NameInConstraintIsNotATypeParameter(), KtAbstractFirDiagnostic internal class BoundOnTypeAliasParameterNotAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BoundOnTypeAliasParameterNotAllowed(), KtAbstractFirDiagnostic internal class ReifiedTypeParameterNoInlineImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReifiedTypeParameterNoInline(), KtAbstractFirDiagnostic internal class TypeParametersNotAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParametersNotAllowed(), KtAbstractFirDiagnostic internal class TypeParameterOfPropertyNotUsedInReceiverImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterOfPropertyNotUsedInReceiver(), KtAbstractFirDiagnostic @@ -1545,41 +1539,41 @@ internal class ReturnTypeMismatchImpl( override val actualType: KtType, override val targetFunction: KtSymbol, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnTypeMismatch(), KtAbstractFirDiagnostic internal class CyclicGenericUpperBoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CyclicGenericUpperBound(), KtAbstractFirDiagnostic internal class DeprecatedTypeParameterSyntaxImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedTypeParameterSyntax(), KtAbstractFirDiagnostic internal class MisplacedTypeParameterConstraintsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MisplacedTypeParameterConstraints(), KtAbstractFirDiagnostic internal class DynamicUpperBoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DynamicUpperBound(), KtAbstractFirDiagnostic internal class IncompatibleTypesImpl( override val typeA: KtType, override val typeB: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncompatibleTypes(), KtAbstractFirDiagnostic internal class IncompatibleTypesWarningImpl( override val typeA: KtType, override val typeB: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncompatibleTypesWarning(), KtAbstractFirDiagnostic @@ -1588,7 +1582,7 @@ internal class TypeVarianceConflictImpl( override val typeParameterVariance: Variance, override val variance: Variance, override val containingType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeVarianceConflict(), KtAbstractFirDiagnostic @@ -1597,7 +1591,7 @@ internal class TypeVarianceConflictInExpandedTypeImpl( override val typeParameterVariance: Variance, override val variance: Variance, override val containingType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeVarianceConflictInExpandedType(), KtAbstractFirDiagnostic @@ -1606,59 +1600,59 @@ internal class SmartcastImpossibleImpl( override val subject: KtExpression, override val description: String, override val isCastToNotNull: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SmartcastImpossible(), KtAbstractFirDiagnostic internal class ExtensionInClassReferenceNotAllowedImpl( override val referencedDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExtensionInClassReferenceNotAllowed(), KtAbstractFirDiagnostic internal class CallableReferenceLhsNotAClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CallableReferenceLhsNotAClass(), KtAbstractFirDiagnostic internal class CallableReferenceToAnnotationConstructorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CallableReferenceToAnnotationConstructor(), KtAbstractFirDiagnostic internal class ClassLiteralLhsNotAClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ClassLiteralLhsNotAClass(), KtAbstractFirDiagnostic internal class NullableTypeInClassLiteralLhsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NullableTypeInClassLiteralLhs(), KtAbstractFirDiagnostic internal class ExpressionOfNullableTypeInClassLiteralLhsImpl( override val lhsType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpressionOfNullableTypeInClassLiteralLhs(), KtAbstractFirDiagnostic internal class NothingToOverrideImpl( override val declaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NothingToOverride(), KtAbstractFirDiagnostic internal class CannotOverrideInvisibleMemberImpl( override val overridingMember: KtCallableSymbol, override val baseMember: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotOverrideInvisibleMember(), KtAbstractFirDiagnostic internal class DataClassOverrideConflictImpl( override val overridingMember: KtCallableSymbol, override val baseMember: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DataClassOverrideConflict(), KtAbstractFirDiagnostic @@ -1666,7 +1660,7 @@ internal class CannotWeakenAccessPrivilegeImpl( override val overridingVisibility: Visibility, override val overridden: KtCallableSymbol, override val containingClassName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotWeakenAccessPrivilege(), KtAbstractFirDiagnostic @@ -1674,476 +1668,476 @@ internal class CannotChangeAccessPrivilegeImpl( override val overridingVisibility: Visibility, override val overridden: KtCallableSymbol, override val containingClassName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotChangeAccessPrivilege(), KtAbstractFirDiagnostic internal class OverridingFinalMemberImpl( override val overriddenDeclaration: KtCallableSymbol, override val containingClassName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverridingFinalMember(), KtAbstractFirDiagnostic internal class ReturnTypeMismatchOnInheritanceImpl( override val conflictingDeclaration1: KtCallableSymbol, override val conflictingDeclaration2: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnTypeMismatchOnInheritance(), KtAbstractFirDiagnostic internal class PropertyTypeMismatchOnInheritanceImpl( override val conflictingDeclaration1: KtCallableSymbol, override val conflictingDeclaration2: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyTypeMismatchOnInheritance(), KtAbstractFirDiagnostic internal class VarTypeMismatchOnInheritanceImpl( override val conflictingDeclaration1: KtCallableSymbol, override val conflictingDeclaration2: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarTypeMismatchOnInheritance(), KtAbstractFirDiagnostic internal class ReturnTypeMismatchByDelegationImpl( override val delegateDeclaration: KtCallableSymbol, override val baseDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnTypeMismatchByDelegation(), KtAbstractFirDiagnostic internal class PropertyTypeMismatchByDelegationImpl( override val delegateDeclaration: KtCallableSymbol, override val baseDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyTypeMismatchByDelegation(), KtAbstractFirDiagnostic internal class VarOverriddenByValByDelegationImpl( override val delegateDeclaration: KtCallableSymbol, override val baseDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarOverriddenByValByDelegation(), KtAbstractFirDiagnostic internal class ConflictingInheritedMembersImpl( override val conflictingDeclarations: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingInheritedMembers(), KtAbstractFirDiagnostic internal class AbstractMemberNotImplementedImpl( override val classOrObject: KtClassLikeSymbol, override val missingDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractMemberNotImplemented(), KtAbstractFirDiagnostic internal class AbstractClassMemberNotImplementedImpl( override val classOrObject: KtClassLikeSymbol, override val missingDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractClassMemberNotImplemented(), KtAbstractFirDiagnostic internal class InvisibleAbstractMemberFromSuperErrorImpl( override val classOrObject: KtClassLikeSymbol, override val invisibleDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvisibleAbstractMemberFromSuperError(), KtAbstractFirDiagnostic internal class InvisibleAbstractMemberFromSuperWarningImpl( override val classOrObject: KtClassLikeSymbol, override val invisibleDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvisibleAbstractMemberFromSuperWarning(), KtAbstractFirDiagnostic internal class AmbiguousAnonymousTypeInferredImpl( override val superTypes: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AmbiguousAnonymousTypeInferred(), KtAbstractFirDiagnostic internal class ManyImplMemberNotImplementedImpl( override val classOrObject: KtClassLikeSymbol, override val missingDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ManyImplMemberNotImplemented(), KtAbstractFirDiagnostic internal class ManyInterfacesMemberNotImplementedImpl( override val classOrObject: KtClassLikeSymbol, override val missingDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ManyInterfacesMemberNotImplemented(), KtAbstractFirDiagnostic internal class OverridingFinalMemberByDelegationImpl( override val delegatedDeclaration: KtCallableSymbol, override val overriddenDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverridingFinalMemberByDelegation(), KtAbstractFirDiagnostic internal class DelegatedMemberHidesSupertypeOverrideImpl( override val delegatedDeclaration: KtCallableSymbol, override val overriddenDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegatedMemberHidesSupertypeOverride(), KtAbstractFirDiagnostic internal class ReturnTypeMismatchOnOverrideImpl( override val function: KtCallableSymbol, override val superFunction: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnTypeMismatchOnOverride(), KtAbstractFirDiagnostic internal class PropertyTypeMismatchOnOverrideImpl( override val property: KtCallableSymbol, override val superProperty: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyTypeMismatchOnOverride(), KtAbstractFirDiagnostic internal class VarTypeMismatchOnOverrideImpl( override val variable: KtCallableSymbol, override val superVariable: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarTypeMismatchOnOverride(), KtAbstractFirDiagnostic internal class VarOverriddenByValImpl( override val overridingDeclaration: KtCallableSymbol, override val overriddenDeclaration: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VarOverriddenByVal(), KtAbstractFirDiagnostic internal class NonFinalMemberInFinalClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonFinalMemberInFinalClass(), KtAbstractFirDiagnostic internal class NonFinalMemberInObjectImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonFinalMemberInObject(), KtAbstractFirDiagnostic internal class VirtualMemberHiddenImpl( override val declared: KtCallableSymbol, override val overriddenContainer: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VirtualMemberHidden(), KtAbstractFirDiagnostic internal class ManyCompanionObjectsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ManyCompanionObjects(), KtAbstractFirDiagnostic internal class ConflictingOverloadsImpl( override val conflictingOverloads: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingOverloads(), KtAbstractFirDiagnostic internal class RedeclarationImpl( override val conflictingDeclarations: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.Redeclaration(), KtAbstractFirDiagnostic internal class PackageOrClassifierRedeclarationImpl( override val conflictingDeclarations: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PackageOrClassifierRedeclaration(), KtAbstractFirDiagnostic internal class MethodOfAnyImplementedInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MethodOfAnyImplementedInInterface(), KtAbstractFirDiagnostic internal class LocalObjectNotAllowedImpl( override val objectName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalObjectNotAllowed(), KtAbstractFirDiagnostic internal class LocalInterfaceNotAllowedImpl( override val interfaceName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalInterfaceNotAllowed(), KtAbstractFirDiagnostic internal class AbstractFunctionInNonAbstractClassImpl( override val function: KtCallableSymbol, override val containingClass: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractFunctionInNonAbstractClass(), KtAbstractFirDiagnostic internal class AbstractFunctionWithBodyImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractFunctionWithBody(), KtAbstractFirDiagnostic internal class NonAbstractFunctionWithNoBodyImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonAbstractFunctionWithNoBody(), KtAbstractFirDiagnostic internal class PrivateFunctionWithNoBodyImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrivateFunctionWithNoBody(), KtAbstractFirDiagnostic internal class NonMemberFunctionNoBodyImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonMemberFunctionNoBody(), KtAbstractFirDiagnostic internal class FunctionDeclarationWithNoNameImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunctionDeclarationWithNoName(), KtAbstractFirDiagnostic internal class AnonymousFunctionWithNameImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnonymousFunctionWithName(), KtAbstractFirDiagnostic internal class AnonymousFunctionParameterWithDefaultValueImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnonymousFunctionParameterWithDefaultValue(), KtAbstractFirDiagnostic internal class UselessVarargOnParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessVarargOnParameter(), KtAbstractFirDiagnostic internal class MultipleVarargParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MultipleVarargParameters(), KtAbstractFirDiagnostic internal class ForbiddenVarargParameterTypeImpl( override val varargParameterType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ForbiddenVarargParameterType(), KtAbstractFirDiagnostic internal class ValueParameterWithNoTypeAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValueParameterWithNoTypeAnnotation(), KtAbstractFirDiagnostic internal class CannotInferParameterTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotInferParameterType(), KtAbstractFirDiagnostic internal class NoTailCallsFoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoTailCallsFound(), KtAbstractFirDiagnostic internal class TailrecOnVirtualMemberErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TailrecOnVirtualMemberError(), KtAbstractFirDiagnostic internal class NonTailRecursiveCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonTailRecursiveCall(), KtAbstractFirDiagnostic internal class TailRecursionInTryIsNotSupportedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TailRecursionInTryIsNotSupported(), KtAbstractFirDiagnostic internal class FunInterfaceConstructorReferenceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceConstructorReference(), KtAbstractFirDiagnostic internal class FunInterfaceWrongCountOfAbstractMembersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceWrongCountOfAbstractMembers(), KtAbstractFirDiagnostic internal class FunInterfaceCannotHaveAbstractPropertiesImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceCannotHaveAbstractProperties(), KtAbstractFirDiagnostic internal class FunInterfaceAbstractMethodWithTypeParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceAbstractMethodWithTypeParameters(), KtAbstractFirDiagnostic internal class FunInterfaceAbstractMethodWithDefaultValueImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceAbstractMethodWithDefaultValue(), KtAbstractFirDiagnostic internal class FunInterfaceWithSuspendFunctionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunInterfaceWithSuspendFunction(), KtAbstractFirDiagnostic internal class AbstractPropertyInNonAbstractClassImpl( override val property: KtCallableSymbol, override val containingClass: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractPropertyInNonAbstractClass(), KtAbstractFirDiagnostic internal class PrivatePropertyInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrivatePropertyInInterface(), KtAbstractFirDiagnostic internal class AbstractPropertyWithInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractPropertyWithInitializer(), KtAbstractFirDiagnostic internal class PropertyInitializerInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyInitializerInInterface(), KtAbstractFirDiagnostic internal class PropertyWithNoTypeNoInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyWithNoTypeNoInitializer(), KtAbstractFirDiagnostic internal class MustBeInitializedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MustBeInitialized(), KtAbstractFirDiagnostic internal class MustBeInitializedOrBeAbstractImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.MustBeInitializedOrBeAbstract(), KtAbstractFirDiagnostic internal class ExtensionPropertyMustHaveAccessorsOrBeAbstractImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExtensionPropertyMustHaveAccessorsOrBeAbstract(), KtAbstractFirDiagnostic internal class UnnecessaryLateinitImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnnecessaryLateinit(), KtAbstractFirDiagnostic internal class BackingFieldInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BackingFieldInInterface(), KtAbstractFirDiagnostic internal class ExtensionPropertyWithBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExtensionPropertyWithBackingField(), KtAbstractFirDiagnostic internal class PropertyInitializerNoBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyInitializerNoBackingField(), KtAbstractFirDiagnostic internal class AbstractDelegatedPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractDelegatedProperty(), KtAbstractFirDiagnostic internal class DelegatedPropertyInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegatedPropertyInInterface(), KtAbstractFirDiagnostic internal class AbstractPropertyWithGetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractPropertyWithGetter(), KtAbstractFirDiagnostic internal class AbstractPropertyWithSetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractPropertyWithSetter(), KtAbstractFirDiagnostic internal class PrivateSetterForAbstractPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrivateSetterForAbstractProperty(), KtAbstractFirDiagnostic internal class PrivateSetterForOpenPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrivateSetterForOpenProperty(), KtAbstractFirDiagnostic internal class ValWithSetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValWithSetter(), KtAbstractFirDiagnostic internal class ConstValNotTopLevelOrObjectImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstValNotTopLevelOrObject(), KtAbstractFirDiagnostic internal class ConstValWithGetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstValWithGetter(), KtAbstractFirDiagnostic internal class ConstValWithDelegateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstValWithDelegate(), KtAbstractFirDiagnostic internal class TypeCantBeUsedForConstValImpl( override val constValType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeCantBeUsedForConstVal(), KtAbstractFirDiagnostic internal class ConstValWithoutInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstValWithoutInitializer(), KtAbstractFirDiagnostic internal class ConstValWithNonConstInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConstValWithNonConstInitializer(), KtAbstractFirDiagnostic internal class WrongSetterParameterTypeImpl( override val expectedType: KtType, override val actualType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongSetterParameterType(), KtAbstractFirDiagnostic internal class DelegateUsesExtensionPropertyTypeParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateUsesExtensionPropertyTypeParameter(), KtAbstractFirDiagnostic internal class DelegateUsesExtensionPropertyTypeParameterWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateUsesExtensionPropertyTypeParameterWarning(), KtAbstractFirDiagnostic @@ -2151,200 +2145,200 @@ internal class InitializerTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, override val isMismatchDueToNullability: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InitializerTypeMismatch(), KtAbstractFirDiagnostic internal class GetterVisibilityDiffersFromPropertyVisibilityImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.GetterVisibilityDiffersFromPropertyVisibility(), KtAbstractFirDiagnostic internal class SetterVisibilityInconsistentWithPropertyVisibilityImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SetterVisibilityInconsistentWithPropertyVisibility(), KtAbstractFirDiagnostic internal class WrongSetterReturnTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongSetterReturnType(), KtAbstractFirDiagnostic internal class WrongGetterReturnTypeImpl( override val expectedType: KtType, override val actualType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongGetterReturnType(), KtAbstractFirDiagnostic internal class AccessorForDelegatedPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AccessorForDelegatedProperty(), KtAbstractFirDiagnostic internal class PropertyInitializerWithExplicitFieldDeclarationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyInitializerWithExplicitFieldDeclaration(), KtAbstractFirDiagnostic internal class PropertyFieldDeclarationMissingInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyFieldDeclarationMissingInitializer(), KtAbstractFirDiagnostic internal class LateinitPropertyFieldDeclarationWithInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LateinitPropertyFieldDeclarationWithInitializer(), KtAbstractFirDiagnostic internal class LateinitFieldInValPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LateinitFieldInValProperty(), KtAbstractFirDiagnostic internal class LateinitNullableBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LateinitNullableBackingField(), KtAbstractFirDiagnostic internal class BackingFieldForDelegatedPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.BackingFieldForDelegatedProperty(), KtAbstractFirDiagnostic internal class PropertyMustHaveGetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyMustHaveGetter(), KtAbstractFirDiagnostic internal class PropertyMustHaveSetterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyMustHaveSetter(), KtAbstractFirDiagnostic internal class ExplicitBackingFieldInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExplicitBackingFieldInInterface(), KtAbstractFirDiagnostic internal class ExplicitBackingFieldInAbstractPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExplicitBackingFieldInAbstractProperty(), KtAbstractFirDiagnostic internal class ExplicitBackingFieldInExtensionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExplicitBackingFieldInExtension(), KtAbstractFirDiagnostic internal class RedundantExplicitBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantExplicitBackingField(), KtAbstractFirDiagnostic internal class AbstractPropertyInPrimaryConstructorParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AbstractPropertyInPrimaryConstructorParameters(), KtAbstractFirDiagnostic internal class LocalVariableWithTypeParametersWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalVariableWithTypeParametersWarning(), KtAbstractFirDiagnostic internal class LocalVariableWithTypeParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalVariableWithTypeParameters(), KtAbstractFirDiagnostic internal class ExpectedDeclarationWithBodyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedDeclarationWithBody(), KtAbstractFirDiagnostic internal class ExpectedClassConstructorDelegationCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedClassConstructorDelegationCall(), KtAbstractFirDiagnostic internal class ExpectedClassConstructorPropertyParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedClassConstructorPropertyParameter(), KtAbstractFirDiagnostic internal class ExpectedEnumConstructorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedEnumConstructor(), KtAbstractFirDiagnostic> internal class ExpectedEnumEntryWithBodyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedEnumEntryWithBody(), KtAbstractFirDiagnostic internal class ExpectedPropertyInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedPropertyInitializer(), KtAbstractFirDiagnostic internal class ExpectedDelegatedPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedDelegatedProperty(), KtAbstractFirDiagnostic internal class ExpectedLateinitPropertyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedLateinitProperty(), KtAbstractFirDiagnostic internal class SupertypeInitializedInExpectedClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SupertypeInitializedInExpectedClass(), KtAbstractFirDiagnostic internal class ExpectedPrivateDeclarationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedPrivateDeclaration(), KtAbstractFirDiagnostic internal class ImplementationByDelegationInExpectClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ImplementationByDelegationInExpectClass(), KtAbstractFirDiagnostic internal class ActualTypeAliasNotToClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualTypeAliasNotToClass(), KtAbstractFirDiagnostic internal class ActualTypeAliasToClassWithDeclarationSiteVarianceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualTypeAliasToClassWithDeclarationSiteVariance(), KtAbstractFirDiagnostic internal class ActualTypeAliasWithUseSiteVarianceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualTypeAliasWithUseSiteVariance(), KtAbstractFirDiagnostic internal class ActualTypeAliasWithComplexSubstitutionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualTypeAliasWithComplexSubstitution(), KtAbstractFirDiagnostic internal class ActualFunctionWithDefaultArgumentsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualFunctionWithDefaultArguments(), KtAbstractFirDiagnostic internal class ActualAnnotationConflictingDefaultArgumentValueImpl( override val parameter: KtVariableLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualAnnotationConflictingDefaultArgumentValue(), KtAbstractFirDiagnostic internal class ExpectedFunctionSourceWithDefaultArgumentsNotFoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedFunctionSourceWithDefaultArgumentsNotFound(), KtAbstractFirDiagnostic @@ -2352,65 +2346,65 @@ internal class NoActualForExpectImpl( override val declaration: KtSymbol, override val module: FirModuleData, override val compatibility: Map>, List>, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoActualForExpect(), KtAbstractFirDiagnostic internal class ActualWithoutExpectImpl( override val declaration: KtSymbol, override val compatibility: Map>, List>, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualWithoutExpect(), KtAbstractFirDiagnostic internal class AmbiguousActualsImpl( override val declaration: KtSymbol, override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AmbiguousActuals(), KtAbstractFirDiagnostic internal class AmbiguousExpectsImpl( override val declaration: KtSymbol, override val modules: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AmbiguousExpects(), KtAbstractFirDiagnostic internal class NoActualClassMemberForExpectedClassImpl( override val declaration: KtSymbol, override val members: List>, List>>>, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoActualClassMemberForExpectedClass(), KtAbstractFirDiagnostic internal class ActualMissingImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ActualMissing(), KtAbstractFirDiagnostic internal class InitializerRequiredForDestructuringDeclarationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InitializerRequiredForDestructuringDeclaration(), KtAbstractFirDiagnostic internal class ComponentFunctionMissingImpl( override val missingFunctionName: Name, override val destructingType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ComponentFunctionMissing(), KtAbstractFirDiagnostic internal class ComponentFunctionAmbiguityImpl( override val functionWithAmbiguityName: Name, override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ComponentFunctionAmbiguity(), KtAbstractFirDiagnostic internal class ComponentFunctionOnNullableImpl( override val componentFunctionName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ComponentFunctionOnNullable(), KtAbstractFirDiagnostic @@ -2418,67 +2412,67 @@ internal class ComponentFunctionReturnTypeMismatchImpl( override val componentFunctionName: Name, override val destructingType: KtType, override val expectedType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ComponentFunctionReturnTypeMismatch(), KtAbstractFirDiagnostic internal class UninitializedVariableImpl( override val variable: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UninitializedVariable(), KtAbstractFirDiagnostic internal class UninitializedParameterImpl( override val parameter: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UninitializedParameter(), KtAbstractFirDiagnostic internal class UninitializedEnumEntryImpl( override val enumEntry: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UninitializedEnumEntry(), KtAbstractFirDiagnostic internal class UninitializedEnumCompanionImpl( override val enumClass: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UninitializedEnumCompanion(), KtAbstractFirDiagnostic internal class ValReassignmentImpl( override val variable: KtVariableLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValReassignment(), KtAbstractFirDiagnostic internal class ValReassignmentViaBackingFieldErrorImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValReassignmentViaBackingFieldError(), KtAbstractFirDiagnostic internal class ValReassignmentViaBackingFieldWarningImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValReassignmentViaBackingFieldWarning(), KtAbstractFirDiagnostic internal class CapturedValInitializationImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CapturedValInitialization(), KtAbstractFirDiagnostic internal class CapturedMemberValInitializationImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CapturedMemberValInitialization(), KtAbstractFirDiagnostic internal class SetterProjectedOutImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SetterProjectedOut(), KtAbstractFirDiagnostic @@ -2486,61 +2480,61 @@ internal class WrongInvocationKindImpl( override val declaration: KtSymbol, override val requiredRange: EventOccurrencesRange, override val actualRange: EventOccurrencesRange, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongInvocationKind(), KtAbstractFirDiagnostic internal class LeakedInPlaceLambdaImpl( override val lambda: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LeakedInPlaceLambda(), KtAbstractFirDiagnostic internal class WrongImpliesConditionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.WrongImpliesCondition(), KtAbstractFirDiagnostic internal class VariableWithNoTypeNoInitializerImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VariableWithNoTypeNoInitializer(), KtAbstractFirDiagnostic internal class InitializationBeforeDeclarationImpl( override val property: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InitializationBeforeDeclaration(), KtAbstractFirDiagnostic internal class UnreachableCodeImpl( override val reachable: List, override val unreachable: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnreachableCode(), KtAbstractFirDiagnostic internal class SenselessComparisonImpl( override val expression: KtExpression, override val compareResult: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SenselessComparison(), KtAbstractFirDiagnostic internal class SenselessNullInWhenImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SenselessNullInWhen(), KtAbstractFirDiagnostic internal class UnsafeCallImpl( override val receiverType: KtType, override val receiverExpression: KtExpression?, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnsafeCall(), KtAbstractFirDiagnostic internal class UnsafeImplicitInvokeCallImpl( override val receiverType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnsafeImplicitInvokeCall(), KtAbstractFirDiagnostic @@ -2548,7 +2542,7 @@ internal class UnsafeInfixCallImpl( override val receiverExpression: KtExpression, override val operator: String, override val argumentExpression: KtExpression, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnsafeInfixCall(), KtAbstractFirDiagnostic @@ -2556,120 +2550,120 @@ internal class UnsafeOperatorCallImpl( override val receiverExpression: KtExpression, override val operator: String, override val argumentExpression: KtExpression, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnsafeOperatorCall(), KtAbstractFirDiagnostic internal class IteratorOnNullableImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IteratorOnNullable(), KtAbstractFirDiagnostic internal class UnnecessarySafeCallImpl( override val receiverType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnnecessarySafeCall(), KtAbstractFirDiagnostic internal class SafeCallWillChangeNullabilityImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SafeCallWillChangeNullability(), KtAbstractFirDiagnostic internal class UnexpectedSafeCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnexpectedSafeCall(), KtAbstractFirDiagnostic internal class UnnecessaryNotNullAssertionImpl( override val receiverType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnnecessaryNotNullAssertion(), KtAbstractFirDiagnostic internal class NotNullAssertionOnLambdaExpressionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotNullAssertionOnLambdaExpression(), KtAbstractFirDiagnostic internal class NotNullAssertionOnCallableReferenceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotNullAssertionOnCallableReference(), KtAbstractFirDiagnostic internal class UselessElvisImpl( override val receiverType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessElvis(), KtAbstractFirDiagnostic internal class UselessElvisRightIsNullImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessElvisRightIsNull(), KtAbstractFirDiagnostic internal class UselessCastImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessCast(), KtAbstractFirDiagnostic internal class UselessIsCheckImpl( override val compileTimeCheckResult: Boolean, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessIsCheck(), KtAbstractFirDiagnostic internal class IsEnumEntryImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IsEnumEntry(), KtAbstractFirDiagnostic internal class EnumEntryAsTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EnumEntryAsType(), KtAbstractFirDiagnostic internal class ExpectedConditionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpectedCondition(), KtAbstractFirDiagnostic internal class NoElseInWhenImpl( override val missingWhenCases: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoElseInWhen(), KtAbstractFirDiagnostic internal class NonExhaustiveWhenStatementImpl( override val type: String, override val missingWhenCases: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonExhaustiveWhenStatement(), KtAbstractFirDiagnostic internal class InvalidIfAsExpressionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvalidIfAsExpression(), KtAbstractFirDiagnostic internal class ElseMisplacedInWhenImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ElseMisplacedInWhen(), KtAbstractFirDiagnostic internal class IllegalDeclarationInWhenSubjectImpl( override val illegalReason: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalDeclarationInWhenSubject(), KtAbstractFirDiagnostic internal class CommaInWhenConditionWithoutArgumentImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CommaInWhenConditionWithoutArgument(), KtAbstractFirDiagnostic internal class DuplicateLabelInWhenImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DuplicateLabelInWhen(), KtAbstractFirDiagnostic @@ -2685,67 +2679,67 @@ internal class ConfusingBranchConditionWarningImpl( internal class TypeParameterIsNotAnExpressionImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterIsNotAnExpression(), KtAbstractFirDiagnostic internal class TypeParameterOnLhsOfDotImpl( override val typeParameter: KtTypeParameterSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypeParameterOnLhsOfDot(), KtAbstractFirDiagnostic internal class NoCompanionObjectImpl( override val klass: KtClassLikeSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoCompanionObject(), KtAbstractFirDiagnostic internal class ExpressionExpectedPackageFoundImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExpressionExpectedPackageFound(), KtAbstractFirDiagnostic internal class ErrorInContractDescriptionImpl( override val reason: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ErrorInContractDescription(), KtAbstractFirDiagnostic internal class NoGetMethodImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoGetMethod(), KtAbstractFirDiagnostic internal class NoSetMethodImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoSetMethod(), KtAbstractFirDiagnostic internal class IteratorMissingImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IteratorMissing(), KtAbstractFirDiagnostic internal class HasNextMissingImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.HasNextMissing(), KtAbstractFirDiagnostic internal class NextMissingImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NextMissing(), KtAbstractFirDiagnostic internal class HasNextFunctionNoneApplicableImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.HasNextFunctionNoneApplicable(), KtAbstractFirDiagnostic internal class NextNoneApplicableImpl( override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NextNoneApplicable(), KtAbstractFirDiagnostic @@ -2753,21 +2747,21 @@ internal class DelegateSpecialFunctionMissingImpl( override val expectedFunctionSignature: String, override val delegateType: KtType, override val description: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateSpecialFunctionMissing(), KtAbstractFirDiagnostic internal class DelegateSpecialFunctionAmbiguityImpl( override val expectedFunctionSignature: String, override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateSpecialFunctionAmbiguity(), KtAbstractFirDiagnostic internal class DelegateSpecialFunctionNoneApplicableImpl( override val expectedFunctionSignature: String, override val candidates: List, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateSpecialFunctionNoneApplicable(), KtAbstractFirDiagnostic @@ -2775,34 +2769,34 @@ internal class DelegateSpecialFunctionReturnTypeMismatchImpl( override val delegateFunction: String, override val expectedType: KtType, override val actualType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegateSpecialFunctionReturnTypeMismatch(), KtAbstractFirDiagnostic internal class UnderscoreIsReservedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnderscoreIsReserved(), KtAbstractFirDiagnostic internal class UnderscoreUsageWithoutBackticksImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnderscoreUsageWithoutBackticks(), KtAbstractFirDiagnostic internal class ResolvedToUnderscoreNamedCatchParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ResolvedToUnderscoreNamedCatchParameter(), KtAbstractFirDiagnostic internal class InvalidCharactersImpl( override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvalidCharacters(), KtAbstractFirDiagnostic internal class DangerousCharactersImpl( override val characters: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DangerousCharacters(), KtAbstractFirDiagnostic @@ -2810,7 +2804,7 @@ internal class EqualityNotApplicableImpl( override val operator: String, override val leftType: KtType, override val rightType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EqualityNotApplicable(), KtAbstractFirDiagnostic @@ -2818,32 +2812,32 @@ internal class EqualityNotApplicableWarningImpl( override val operator: String, override val leftType: KtType, override val rightType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EqualityNotApplicableWarning(), KtAbstractFirDiagnostic internal class IncompatibleEnumComparisonErrorImpl( override val leftType: KtType, override val rightType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncompatibleEnumComparisonError(), KtAbstractFirDiagnostic internal class IncDecShouldNotReturnUnitImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IncDecShouldNotReturnUnit(), KtAbstractFirDiagnostic internal class AssignmentOperatorShouldReturnUnitImpl( override val functionSymbol: KtFunctionLikeSymbol, override val operator: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssignmentOperatorShouldReturnUnit(), KtAbstractFirDiagnostic internal class PropertyAsOperatorImpl( override val property: KtVariableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PropertyAsOperator(), KtAbstractFirDiagnostic @@ -2854,103 +2848,103 @@ internal class DslScopeViolationImpl( ) : KtFirDiagnostic.DslScopeViolation(), KtAbstractFirDiagnostic internal class ToplevelTypealiasesOnlyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ToplevelTypealiasesOnly(), KtAbstractFirDiagnostic internal class RecursiveTypealiasExpansionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RecursiveTypealiasExpansion(), KtAbstractFirDiagnostic internal class TypealiasShouldExpandToClassImpl( override val expandedType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.TypealiasShouldExpandToClass(), KtAbstractFirDiagnostic internal class RedundantVisibilityModifierImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantVisibilityModifier(), KtAbstractFirDiagnostic internal class RedundantModalityModifierImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantModalityModifier(), KtAbstractFirDiagnostic internal class RedundantReturnUnitTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantReturnUnitType(), KtAbstractFirDiagnostic internal class RedundantExplicitTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantExplicitType(), KtAbstractFirDiagnostic internal class RedundantSingleExpressionStringTemplateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantSingleExpressionStringTemplate(), KtAbstractFirDiagnostic internal class CanBeValImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CanBeVal(), KtAbstractFirDiagnostic internal class CanBeReplacedWithOperatorAssignmentImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CanBeReplacedWithOperatorAssignment(), KtAbstractFirDiagnostic internal class RedundantCallOfConversionMethodImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantCallOfConversionMethod(), KtAbstractFirDiagnostic internal class ArrayEqualityOperatorCanBeReplacedWithEqualsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ArrayEqualityOperatorCanBeReplacedWithEquals(), KtAbstractFirDiagnostic internal class EmptyRangeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EmptyRange(), KtAbstractFirDiagnostic internal class RedundantSetterParameterTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantSetterParameterType(), KtAbstractFirDiagnostic internal class UnusedVariableImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UnusedVariable(), KtAbstractFirDiagnostic internal class AssignedValueIsNeverReadImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AssignedValueIsNeverRead(), KtAbstractFirDiagnostic internal class VariableInitializerIsRedundantImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VariableInitializerIsRedundant(), KtAbstractFirDiagnostic internal class VariableNeverReadImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VariableNeverRead(), KtAbstractFirDiagnostic internal class UselessCallOnNotNullImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UselessCallOnNotNull(), KtAbstractFirDiagnostic internal class ReturnNotAllowedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnNotAllowed(), KtAbstractFirDiagnostic @@ -2960,537 +2954,537 @@ internal class NotAFunctionLabelImpl( ) : KtFirDiagnostic.NotAFunctionLabel(), KtAbstractFirDiagnostic internal class ReturnInFunctionWithExpressionBodyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnInFunctionWithExpressionBody(), KtAbstractFirDiagnostic internal class NoReturnInFunctionWithBlockBodyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NoReturnInFunctionWithBlockBody(), KtAbstractFirDiagnostic internal class AnonymousInitializerInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.AnonymousInitializerInInterface(), KtAbstractFirDiagnostic internal class UsageIsNotInlinableImpl( override val parameter: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UsageIsNotInlinable(), KtAbstractFirDiagnostic internal class NonLocalReturnNotAllowedImpl( override val parameter: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonLocalReturnNotAllowed(), KtAbstractFirDiagnostic internal class NotYetSupportedInInlineImpl( override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NotYetSupportedInInline(), KtAbstractFirDiagnostic internal class NothingToInlineImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NothingToInline(), KtAbstractFirDiagnostic internal class NullableInlineParameterImpl( override val parameter: KtSymbol, override val function: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NullableInlineParameter(), KtAbstractFirDiagnostic internal class RecursionInInlineImpl( override val symbol: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RecursionInInline(), KtAbstractFirDiagnostic internal class NonPublicCallFromPublicInlineImpl( override val inlineDeclaration: KtSymbol, override val referencedDeclaration: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonPublicCallFromPublicInline(), KtAbstractFirDiagnostic internal class ProtectedConstructorCallFromPublicInlineImpl( override val inlineDeclaration: KtSymbol, override val referencedDeclaration: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ProtectedConstructorCallFromPublicInline(), KtAbstractFirDiagnostic internal class ProtectedCallFromPublicInlineErrorImpl( override val inlineDeclaration: KtSymbol, override val referencedDeclaration: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ProtectedCallFromPublicInlineError(), KtAbstractFirDiagnostic internal class ProtectedCallFromPublicInlineImpl( override val inlineDeclaration: KtSymbol, override val referencedDeclaration: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ProtectedCallFromPublicInline(), KtAbstractFirDiagnostic internal class PrivateClassMemberFromInlineImpl( override val inlineDeclaration: KtSymbol, override val referencedDeclaration: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PrivateClassMemberFromInline(), KtAbstractFirDiagnostic internal class SuperCallFromPublicInlineImpl( override val symbol: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuperCallFromPublicInline(), KtAbstractFirDiagnostic internal class DeclarationCantBeInlinedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeclarationCantBeInlined(), KtAbstractFirDiagnostic internal class OverrideByInlineImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverrideByInline(), KtAbstractFirDiagnostic internal class NonInternalPublishedApiImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonInternalPublishedApi(), KtAbstractFirDiagnostic internal class InvalidDefaultFunctionalParameterForInlineImpl( override val defaultValue: KtExpression, override val parameter: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InvalidDefaultFunctionalParameterForInline(), KtAbstractFirDiagnostic internal class ReifiedTypeParameterInOverrideImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReifiedTypeParameterInOverride(), KtAbstractFirDiagnostic internal class InlinePropertyWithBackingFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlinePropertyWithBackingField(), KtAbstractFirDiagnostic internal class IllegalInlineParameterModifierImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalInlineParameterModifier(), KtAbstractFirDiagnostic internal class InlineSuspendFunctionTypeUnsupportedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InlineSuspendFunctionTypeUnsupported(), KtAbstractFirDiagnostic internal class RedundantInlineSuspendFunctionTypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantInlineSuspendFunctionType(), KtAbstractFirDiagnostic internal class CannotAllUnderImportFromSingletonImpl( override val objectName: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotAllUnderImportFromSingleton(), KtAbstractFirDiagnostic internal class PackageCannotBeImportedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PackageCannotBeImported(), KtAbstractFirDiagnostic internal class CannotBeImportedImpl( override val name: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.CannotBeImported(), KtAbstractFirDiagnostic internal class ConflictingImportImpl( override val name: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingImport(), KtAbstractFirDiagnostic internal class OperatorRenamedOnImportImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OperatorRenamedOnImport(), KtAbstractFirDiagnostic internal class IllegalSuspendFunctionCallImpl( override val suspendCallable: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalSuspendFunctionCall(), KtAbstractFirDiagnostic internal class IllegalSuspendPropertyAccessImpl( override val suspendCallable: KtSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalSuspendPropertyAccess(), KtAbstractFirDiagnostic internal class NonLocalSuspensionPointImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonLocalSuspensionPoint(), KtAbstractFirDiagnostic internal class IllegalRestrictedSuspendingFunctionCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalRestrictedSuspendingFunctionCall(), KtAbstractFirDiagnostic internal class NonModifierFormForBuiltInSuspendImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonModifierFormForBuiltInSuspend(), KtAbstractFirDiagnostic internal class ModifierFormForNonBuiltInSuspendImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ModifierFormForNonBuiltInSuspend(), KtAbstractFirDiagnostic internal class ReturnForBuiltInSuspendImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ReturnForBuiltInSuspend(), KtAbstractFirDiagnostic internal class RedundantLabelWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RedundantLabelWarning(), KtAbstractFirDiagnostic internal class ConflictingJvmDeclarationsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConflictingJvmDeclarations(), KtAbstractFirDiagnostic internal class OverrideCannotBeStaticImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverrideCannotBeStatic(), KtAbstractFirDiagnostic internal class JvmStaticNotInObjectOrClassCompanionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmStaticNotInObjectOrClassCompanion(), KtAbstractFirDiagnostic internal class JvmStaticNotInObjectOrCompanionImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmStaticNotInObjectOrCompanion(), KtAbstractFirDiagnostic internal class JvmStaticOnNonPublicMemberImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmStaticOnNonPublicMember(), KtAbstractFirDiagnostic internal class JvmStaticOnConstOrJvmFieldImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmStaticOnConstOrJvmField(), KtAbstractFirDiagnostic internal class JvmStaticOnExternalInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmStaticOnExternalInInterface(), KtAbstractFirDiagnostic internal class InapplicableJvmNameImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableJvmName(), KtAbstractFirDiagnostic internal class IllegalJvmNameImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalJvmName(), KtAbstractFirDiagnostic internal class FunctionDelegateMemberNameClashImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FunctionDelegateMemberNameClash(), KtAbstractFirDiagnostic internal class ValueClassWithoutJvmInlineAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ValueClassWithoutJvmInlineAnnotation(), KtAbstractFirDiagnostic internal class JvmInlineWithoutValueClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmInlineWithoutValueClass(), KtAbstractFirDiagnostic internal class JavaTypeMismatchImpl( override val expectedType: KtType, override val actualType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JavaTypeMismatch(), KtAbstractFirDiagnostic internal class UpperBoundCannotBeArrayImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UpperBoundCannotBeArray(), KtAbstractFirDiagnostic internal class StrictfpOnClassImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.StrictfpOnClass(), KtAbstractFirDiagnostic internal class VolatileOnValueImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VolatileOnValue(), KtAbstractFirDiagnostic internal class VolatileOnDelegateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.VolatileOnDelegate(), KtAbstractFirDiagnostic internal class SynchronizedOnAbstractImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SynchronizedOnAbstract(), KtAbstractFirDiagnostic internal class SynchronizedInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SynchronizedInInterface(), KtAbstractFirDiagnostic internal class SynchronizedOnInlineImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SynchronizedOnInline(), KtAbstractFirDiagnostic internal class OverloadsWithoutDefaultArgumentsImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsWithoutDefaultArguments(), KtAbstractFirDiagnostic internal class OverloadsAbstractImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsAbstract(), KtAbstractFirDiagnostic internal class OverloadsInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsInterface(), KtAbstractFirDiagnostic internal class OverloadsLocalImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsLocal(), KtAbstractFirDiagnostic internal class OverloadsAnnotationClassConstructorErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsAnnotationClassConstructorError(), KtAbstractFirDiagnostic internal class OverloadsAnnotationClassConstructorWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsAnnotationClassConstructorWarning(), KtAbstractFirDiagnostic internal class OverloadsPrivateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.OverloadsPrivate(), KtAbstractFirDiagnostic internal class DeprecatedJavaAnnotationImpl( override val kotlinName: FqName, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DeprecatedJavaAnnotation(), KtAbstractFirDiagnostic internal class JvmPackageNameCannotBeEmptyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmPackageNameCannotBeEmpty(), KtAbstractFirDiagnostic internal class JvmPackageNameMustBeValidNameImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmPackageNameMustBeValidName(), KtAbstractFirDiagnostic internal class JvmPackageNameNotSupportedInFilesWithClassesImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmPackageNameNotSupportedInFilesWithClasses(), KtAbstractFirDiagnostic internal class PositionedValueArgumentForJavaAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.PositionedValueArgumentForJavaAnnotation(), KtAbstractFirDiagnostic internal class LocalJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.LocalJvmRecord(), KtAbstractFirDiagnostic internal class NonFinalJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonFinalJvmRecord(), KtAbstractFirDiagnostic internal class EnumJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.EnumJvmRecord(), KtAbstractFirDiagnostic internal class JvmRecordWithoutPrimaryConstructorParametersImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmRecordWithoutPrimaryConstructorParameters(), KtAbstractFirDiagnostic internal class NonDataClassJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonDataClassJvmRecord(), KtAbstractFirDiagnostic internal class JvmRecordNotValParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmRecordNotValParameter(), KtAbstractFirDiagnostic internal class JvmRecordNotLastVarargParameterImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmRecordNotLastVarargParameter(), KtAbstractFirDiagnostic internal class InnerJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InnerJvmRecord(), KtAbstractFirDiagnostic internal class FieldInJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.FieldInJvmRecord(), KtAbstractFirDiagnostic internal class DelegationByInJvmRecordImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DelegationByInJvmRecord(), KtAbstractFirDiagnostic internal class JvmRecordExtendsClassImpl( override val superType: KtType, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmRecordExtendsClass(), KtAbstractFirDiagnostic internal class IllegalJavaLangRecordSupertypeImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.IllegalJavaLangRecordSupertype(), KtAbstractFirDiagnostic internal class JvmDefaultNotInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmDefaultNotInInterface(), KtAbstractFirDiagnostic internal class JvmDefaultInJvm6TargetImpl( override val annotation: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmDefaultInJvm6Target(), KtAbstractFirDiagnostic internal class JvmDefaultRequiredForOverrideImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmDefaultRequiredForOverride(), KtAbstractFirDiagnostic internal class JvmDefaultInDeclarationImpl( override val annotation: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmDefaultInDeclaration(), KtAbstractFirDiagnostic internal class JvmDefaultThroughInheritanceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmDefaultThroughInheritance(), KtAbstractFirDiagnostic internal class UsageOfJvmDefaultThroughSuperCallImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.UsageOfJvmDefaultThroughSuperCall(), KtAbstractFirDiagnostic internal class NonJvmDefaultOverridesJavaDefaultImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonJvmDefaultOverridesJavaDefault(), KtAbstractFirDiagnostic internal class ExternalDeclarationCannotBeAbstractImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExternalDeclarationCannotBeAbstract(), KtAbstractFirDiagnostic internal class ExternalDeclarationCannotHaveBodyImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExternalDeclarationCannotHaveBody(), KtAbstractFirDiagnostic internal class ExternalDeclarationInInterfaceImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExternalDeclarationInInterface(), KtAbstractFirDiagnostic internal class ExternalDeclarationCannotBeInlinedImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ExternalDeclarationCannotBeInlined(), KtAbstractFirDiagnostic internal class NonSourceRepeatedAnnotationImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.NonSourceRepeatedAnnotation(), KtAbstractFirDiagnostic internal class RepeatedAnnotationTarget6Impl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedAnnotationTarget6(), KtAbstractFirDiagnostic internal class RepeatedAnnotationWithContainerImpl( override val name: ClassId, override val explicitContainerName: ClassId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatedAnnotationWithContainer(), KtAbstractFirDiagnostic internal class RepeatableContainerMustHaveValueArrayErrorImpl( override val container: ClassId, override val annotation: ClassId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerMustHaveValueArrayError(), KtAbstractFirDiagnostic internal class RepeatableContainerMustHaveValueArrayWarningImpl( override val container: ClassId, override val annotation: ClassId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerMustHaveValueArrayWarning(), KtAbstractFirDiagnostic internal class RepeatableContainerHasNonDefaultParameterErrorImpl( override val container: ClassId, override val nonDefault: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerHasNonDefaultParameterError(), KtAbstractFirDiagnostic internal class RepeatableContainerHasNonDefaultParameterWarningImpl( override val container: ClassId, override val nonDefault: Name, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerHasNonDefaultParameterWarning(), KtAbstractFirDiagnostic @@ -3499,7 +3493,7 @@ internal class RepeatableContainerHasShorterRetentionErrorImpl( override val retention: String, override val annotation: ClassId, override val annotationRetention: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerHasShorterRetentionError(), KtAbstractFirDiagnostic @@ -3508,99 +3502,99 @@ internal class RepeatableContainerHasShorterRetentionWarningImpl( override val retention: String, override val annotation: ClassId, override val annotationRetention: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerHasShorterRetentionWarning(), KtAbstractFirDiagnostic internal class RepeatableContainerTargetSetNotASubsetErrorImpl( override val container: ClassId, override val annotation: ClassId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerTargetSetNotASubsetError(), KtAbstractFirDiagnostic internal class RepeatableContainerTargetSetNotASubsetWarningImpl( override val container: ClassId, override val annotation: ClassId, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableContainerTargetSetNotASubsetWarning(), KtAbstractFirDiagnostic internal class RepeatableAnnotationHasNestedClassNamedContainerErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableAnnotationHasNestedClassNamedContainerError(), KtAbstractFirDiagnostic internal class RepeatableAnnotationHasNestedClassNamedContainerWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.RepeatableAnnotationHasNestedClassNamedContainerWarning(), KtAbstractFirDiagnostic internal class SuspensionPointInsideCriticalSectionImpl( override val function: KtCallableSymbol, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SuspensionPointInsideCriticalSection(), KtAbstractFirDiagnostic internal class InapplicableJvmFieldImpl( override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableJvmField(), KtAbstractFirDiagnostic internal class InapplicableJvmFieldWarningImpl( override val message: String, - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InapplicableJvmFieldWarning(), KtAbstractFirDiagnostic internal class JvmSyntheticOnDelegateImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.JvmSyntheticOnDelegate(), KtAbstractFirDiagnostic internal class DefaultMethodCallFromJava6TargetErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DefaultMethodCallFromJava6TargetError(), KtAbstractFirDiagnostic internal class DefaultMethodCallFromJava6TargetWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.DefaultMethodCallFromJava6TargetWarning(), KtAbstractFirDiagnostic internal class InterfaceStaticMethodCallFromJava6TargetErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InterfaceStaticMethodCallFromJava6TargetError(), KtAbstractFirDiagnostic internal class InterfaceStaticMethodCallFromJava6TargetWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.InterfaceStaticMethodCallFromJava6TargetWarning(), KtAbstractFirDiagnostic internal class SubclassCantCallCompanionProtectedNonStaticImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SubclassCantCallCompanionProtectedNonStatic(), KtAbstractFirDiagnostic internal class ConcurrentHashMapContainsOperatorErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConcurrentHashMapContainsOperatorError(), KtAbstractFirDiagnostic internal class ConcurrentHashMapContainsOperatorWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.ConcurrentHashMapContainsOperatorWarning(), KtAbstractFirDiagnostic internal class SpreadOnSignaturePolymorphicCallErrorImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SpreadOnSignaturePolymorphicCallError(), KtAbstractFirDiagnostic internal class SpreadOnSignaturePolymorphicCallWarningImpl( - override val firDiagnostic: FirPsiDiagnostic, + override val firDiagnostic: KtPsiDiagnostic, override val token: ValidityToken, ) : KtFirDiagnostic.SpreadOnSignaturePolymorphicCallWarning(), KtAbstractFirDiagnostic diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts index 637cf53c319..e840b188378 100644 --- a/analysis/low-level-api-fir/build.gradle.kts +++ b/analysis/low-level-api-fir/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { api(project(":compiler:backend.common.jvm")) api(project(":analysis:analysis-api-impl-barebone")) testApi(project(":analysis:analysis-api-fir")) + implementation(project(":compiler:frontend.common")) implementation(project(":compiler:ir.psi2ir")) implementation(project(":compiler:fir:entrypoint")) implementation(project(":analysis:analysis-api-providers")) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt index 4afe82ec1d4..debd0dca439 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateDepended.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase @@ -75,10 +75,10 @@ internal class FirModuleResolveStateDepended( return null } - override fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List = + override fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List = TODO("Diagnostics are not implemented for depended state") - override fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection = + override fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection = TODO("Diagnostics are not implemented for depended state") @OptIn(InternalForInline::class) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateImpl.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateImpl.kt index a235663b979..cf38feb0ce4 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateImpl.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/FirModuleResolveStateImpl.kt @@ -7,15 +7,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.api.impl.barebone.annotations.InternalForInline -import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic -import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression -import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression -import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics.DiagnosticsCollector @@ -37,6 +28,15 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalDeclaration import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import org.jetbrains.kotlin.analysis.project.structure.getKtModule +import org.jetbrains.kotlin.fir.FirElement +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic +import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.declarations.FirFile +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression +import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression +import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.psi.* @@ -78,10 +78,10 @@ internal class FirModuleResolveStateImpl( override fun tryGetCachedFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? = cache.getContainerFirFile(declaration) - override fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List = + override fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List = diagnosticsCollector.getDiagnosticsFor(element, filter) - override fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection = + override fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection = diagnosticsCollector.collectDiagnosticsForFile(ktFile, filter) @OptIn(InternalForInline::class) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt index 0e64c60ef72..fc266261865 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirModuleResolveState.kt @@ -13,6 +13,9 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.ResolveType import org.jetbrains.kotlin.analysis.project.structure.KtModule +import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic +import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile @@ -44,9 +47,9 @@ abstract class FirModuleResolveState { */ internal abstract fun tryGetCachedFirFile(declaration: FirDeclaration, cache: ModuleFileCache): FirFile? - internal abstract fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List + internal abstract fun getDiagnostics(element: KtElement, filter: DiagnosticCheckerFilter): List - internal abstract fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection + internal abstract fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection @InternalForInline abstract fun findSourceFirDeclaration( diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt index a761b9ccef4..733f2a2c21b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LowLevelFirApiFacade.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule import org.jetbrains.kotlin.analysis.project.structure.getKtModule import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement @@ -148,7 +148,7 @@ fun D.withFirDeclaration( * Returns a list of Diagnostics compiler finds for given [KtElement] * This operation could be performance affective because it create FIleStructureElement and resolve non-local declaration into BODY phase */ -fun KtElement.getDiagnostics(resolveState: FirModuleResolveState, filter: DiagnosticCheckerFilter): Collection = +fun KtElement.getDiagnostics(resolveState: FirModuleResolveState, filter: DiagnosticCheckerFilter): Collection = resolveState.getDiagnostics(this, filter) /** @@ -158,7 +158,7 @@ fun KtElement.getDiagnostics(resolveState: FirModuleResolveState, filter: Diagno fun KtFile.collectDiagnosticsForFile( resolveState: FirModuleResolveState, filter: DiagnosticCheckerFilter -): Collection = +): Collection = resolveState.collectDiagnosticsForFile(this, filter) /** diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/DiagnosticsCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/DiagnosticsCollector.kt index 472b857f777..c201addd442 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/DiagnosticsCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/DiagnosticsCollector.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.ModuleFileCache import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.FileStructureCache +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile @@ -16,14 +16,14 @@ internal class DiagnosticsCollector( private val fileStructureCache: FileStructureCache, private val cache: ModuleFileCache, ) { - fun getDiagnosticsFor(element: KtElement, filter: DiagnosticCheckerFilter): List { + fun getDiagnosticsFor(element: KtElement, filter: DiagnosticCheckerFilter): List { val fileStructure = fileStructureCache.getFileStructure(element.containingKtFile, cache) val structureElement = fileStructure.getStructureElementFor(element) val diagnostics = structureElement.diagnostics return diagnostics.diagnosticsFor(filter, element) } - fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection { + fun collectDiagnosticsForFile(ktFile: KtFile, filter: DiagnosticCheckerFilter): Collection { val fileStructure = fileStructureCache.getFileStructure(ktFile, cache) return fileStructure.getAllDiagnosticsForFile(filter) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticList.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticList.kt index 91bf9cf267f..6e9840d3f72 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticList.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnosticList.kt @@ -6,12 +6,12 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic internal class FileStructureElementDiagnosticList( - private val map: Map> + private val map: Map> ) { - fun diagnosticsFor(element: PsiElement): List = map[element] ?: emptyList() + fun diagnosticsFor(element: PsiElement): List = map[element] ?: emptyList() - inline fun forEach(action: (List) -> Unit) = map.values.forEach(action) + inline fun forEach(action: (List) -> Unit) = map.values.forEach(action) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnostics.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnostics.kt index a8d4e61ccd3..b461308424a 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnostics.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FileStructureElementDiagnostics.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics import com.intellij.psi.PsiElement import com.intellij.util.SmartList -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic -import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LockProvider +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic +import org.jetbrains.kotlin.fir.declarations.FirFile internal class FileStructureElementDiagnostics( private val firFile: FirFile, @@ -25,8 +25,8 @@ internal class FileStructureElementDiagnostics( retriever.retrieve(firFile, FileStructureElementDiagnosticsCollector.EXTENDED_COLLECTOR, lockProvider) } - fun diagnosticsFor(filter: DiagnosticCheckerFilter, element: PsiElement): List = - SmartList().apply { + fun diagnosticsFor(filter: DiagnosticCheckerFilter, element: PsiElement): List = + SmartList().apply { if (filter.runCommonCheckers) { addAll(diagnosticByCommonCheckers.diagnosticsFor(element)) } @@ -36,7 +36,7 @@ internal class FileStructureElementDiagnostics( } - inline fun forEach(filter: DiagnosticCheckerFilter, action: (List) -> Unit) { + inline fun forEach(filter: DiagnosticCheckerFilter, action: (List) -> Unit) { if (filter.runCommonCheckers) { diagnosticByCommonCheckers.forEach(action) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt index 2cd8d53df2a..db5be552bbf 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostics/FirIdeDiagnosticReporter.kt @@ -6,67 +6,66 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostics import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.analysis.low.level.api.fir.util.addValueFor +import org.jetbrains.kotlin.fir.analysis.diagnostics.* internal class FirIdeDiagnosticReporter : DiagnosticReporter() { - val diagnostics = mutableMapOf>() + val diagnostics = mutableMapOf>() - override fun report(diagnostic: FirDiagnostic?, context: CheckerContext) { + override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) { if (diagnostic == null) return if (context.isDiagnosticSuppressed(diagnostic)) return val psiDiagnostic = when (diagnostic) { - is FirPsiDiagnostic -> diagnostic - is FirLightDiagnostic -> diagnostic.toPsiDiagnostic() + is KtPsiDiagnostic -> diagnostic + is KtLightDiagnostic -> diagnostic.toPsiDiagnostic() else -> error("Unknown diagnostic type ${diagnostic::class.simpleName}") } diagnostics.addValueFor(psiDiagnostic.psiElement, psiDiagnostic) } } -private fun FirLightDiagnostic.toPsiDiagnostic(): FirPsiDiagnostic { +private fun KtLightDiagnostic.toPsiDiagnostic(): KtPsiDiagnostic { val psiSourceElement = element.unwrapToKtPsiSourceElement() ?: error("Diagnostic should be created from PSI in IDE") @Suppress("UNCHECKED_CAST") return when (this) { - is FirLightSimpleDiagnostic -> FirPsiSimpleDiagnostic( + is KtLightSimpleDiagnostic -> KtPsiSimpleDiagnostic( psiSourceElement, severity, factory, positioningStrategy ) - is FirLightDiagnosticWithParameters1<*> -> FirPsiDiagnosticWithParameters1( + is KtLightDiagnosticWithParameters1<*> -> KtPsiDiagnosticWithParameters1( psiSourceElement, a, severity, - factory as FirDiagnosticFactory1, + factory as KtDiagnosticFactory1, positioningStrategy ) - is FirLightDiagnosticWithParameters2<*, *> -> FirPsiDiagnosticWithParameters2( + is KtLightDiagnosticWithParameters2<*, *> -> KtPsiDiagnosticWithParameters2( psiSourceElement, a, b, severity, - factory as FirDiagnosticFactory2, + factory as KtDiagnosticFactory2, positioningStrategy ) - is FirLightDiagnosticWithParameters3<*, *, *> -> FirPsiDiagnosticWithParameters3( + is KtLightDiagnosticWithParameters3<*, *, *> -> KtPsiDiagnosticWithParameters3( psiSourceElement, a, b, c, severity, - factory as FirDiagnosticFactory3, + factory as KtDiagnosticFactory3, positioningStrategy ) - is FirLightDiagnosticWithParameters4<*, *, *, *> -> FirPsiDiagnosticWithParameters4( + is KtLightDiagnosticWithParameters4<*, *, *, *> -> KtPsiDiagnosticWithParameters4( psiSourceElement, a, b, c, d, severity, - factory as FirDiagnosticFactory4, + factory as KtDiagnosticFactory4, positioningStrategy ) else -> error("Unknown diagnostic type ${this::class.simpleName}") diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt index b2076e72abf..56a861a2d65 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirPsiDiagnostic -import org.jetbrains.kotlin.fir.declarations.FirFile -import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.element.builder.getNonLocalContainingOrThisDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.FirFileBuilder @@ -18,6 +14,10 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyDecla import org.jetbrains.kotlin.analysis.low.level.api.fir.providers.firIdeProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.util.findSourceNonLocalFirDeclaration import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getElementTextInContext +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtPsiDiagnostic +import org.jetbrains.kotlin.fir.declarations.FirFile +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.psi.* import java.util.concurrent.ConcurrentHashMap @@ -70,7 +70,7 @@ internal class FileStructure private constructor( } @OptIn(ExperimentalStdlibApi::class) - fun getAllDiagnosticsForFile(diagnosticCheckerFilter: DiagnosticCheckerFilter): Collection { + fun getAllDiagnosticsForFile(diagnosticCheckerFilter: DiagnosticCheckerFilter): Collection { val structureElements = getAllStructureElements() return buildList { @@ -78,7 +78,7 @@ internal class FileStructure private constructor( } } - private fun MutableCollection.collectDiagnosticsFromStructureElements( + private fun MutableCollection.collectDiagnosticsFromStructureElements( structureElements: Collection, diagnosticCheckerFilter: DiagnosticCheckerFilter ) { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt index a9335acf336..5a48379d2fe 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/LowLevelFirAnalyzerFacade.kt @@ -10,13 +10,12 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState import org.jetbrains.kotlin.analysis.low.level.api.fir.api.collectDiagnosticsForFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.resolvedFirToPhase import org.jetbrains.kotlin.fir.analysis.AbstractFirAnalyzerFacade -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.backend.Fir2IrResult import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirSealedClassInheritorsProcessor -import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi2ir.generators.GeneratorExtensions import org.jetbrains.kotlin.test.model.TestFile @@ -28,13 +27,13 @@ class LowLevelFirAnalyzerFacade( ) : AbstractFirAnalyzerFacade() { override val scopeSession: ScopeSession get() = shouldNotBeCalled() - override fun runCheckers(): Map> { + override fun runCheckers(): Map> { findSealedInheritors() return allFirFiles.values.associateWith { firFile -> val ktFile = firFile.psi as KtFile val diagnostics = ktFile.collectDiagnosticsForFile(resolveState, diagnosticCheckerFilter) @Suppress("UNCHECKED_CAST") - diagnostics.toList() as List + diagnostics.toList() as List } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt index ea224e00094..aac8291c8f4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/fir/FirDiagnosticsCompilerResultsReporter.kt @@ -14,10 +14,10 @@ import org.jetbrains.kotlin.cli.common.messages.MessageUtil import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic object FirDiagnosticsCompilerResultsReporter { - fun reportDiagnostics(diagnostics: Collection, reporter: MessageCollector): Boolean { + fun reportDiagnostics(diagnostics: Collection, reporter: MessageCollector): Boolean { var hasErrors = false for (diagnostic in diagnostics.sortedWith(DiagnosticComparator)) { hasErrors = reportDiagnostic(diagnostic, reporter) || hasErrors @@ -27,7 +27,7 @@ object FirDiagnosticsCompilerResultsReporter { } @Suppress("UNUSED_PARAMETER") - private fun reportSpecialErrors(diagnostics: Collection) { + private fun reportSpecialErrors(diagnostics: Collection) { /* * TODO: handle next diagnostics when they will be supported in FIR: * - INCOMPATIBLE_CLASS @@ -37,7 +37,7 @@ object FirDiagnosticsCompilerResultsReporter { */ } - private fun reportDiagnostic(diagnostic: FirDiagnostic, reporter: MessageCollector): Boolean { + private fun reportDiagnostic(diagnostic: KtDiagnostic, reporter: MessageCollector): Boolean { if (!diagnostic.isValid) return false diagnostic.location()?.let { location -> val severity = AnalyzerWithCompilerReport.convertSeverity(diagnostic.severity) @@ -48,24 +48,24 @@ object FirDiagnosticsCompilerResultsReporter { return diagnostic.severity == Severity.ERROR } - private fun FirDiagnostic.location(): CompilerMessageSourceLocation? = when (val element = element) { + private fun KtDiagnostic.location(): CompilerMessageSourceLocation? = when (val element = element) { is KtPsiSourceElement -> element.location(this) is KtLightSourceElement -> element.location(this) } - private fun KtPsiSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { + private fun KtPsiSourceElement.location(diagnostic: KtDiagnostic): CompilerMessageSourceLocation? { val file = psi.containingFile return MessageUtil.psiFileToMessageLocation(file, file.name, DiagnosticUtils.getLineAndColumnRange(file, diagnostic.textRanges)) } @Suppress("UNUSED_PARAMETER") - private fun KtLightSourceElement.location(diagnostic: FirDiagnostic): CompilerMessageSourceLocation? { + private fun KtLightSourceElement.location(diagnostic: KtDiagnostic): CompilerMessageSourceLocation? { // TODO: support light tree return null } - private object DiagnosticComparator : Comparator { - override fun compare(o1: FirDiagnostic, o2: FirDiagnostic): Int { + private object DiagnosticComparator : Comparator { + override fun compare(o1: KtDiagnostic, o2: KtDiagnostic): Int { val element1 = o1.element val element2 = o1.element // TODO: support light tree diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt index 7a458e04599..5f18a6b20b5 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.CodegenFactory import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.fir.* -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.backend.Fir2IrResult import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendClassResolver import org.jetbrains.kotlin.fir.backend.jvm.FirJvmBackendExtension @@ -244,16 +244,16 @@ object FirKotlinToJvmBytecodeCompiler { val commonRawFir = commonSession?.buildFirFromKtFiles(commonKtFiles) val rawFir = session.buildFirFromKtFiles(ktFiles) - val allFirDiagnostics = mutableListOf() + val allKtDiagnostics = mutableListOf() commonSession?.apply { val (commonScopeSession, commonFir) = runResolution(commonRawFir!!) - runCheckers(commonScopeSession, commonFir).values.flattenTo(allFirDiagnostics) + runCheckers(commonScopeSession, commonFir).values.flattenTo(allKtDiagnostics) } val (scopeSession, fir) = session.runResolution(rawFir) - session.runCheckers(scopeSession, fir).values.flattenTo(allFirDiagnostics) + session.runCheckers(scopeSession, fir).values.flattenTo(allKtDiagnostics) - val hasErrors = FirDiagnosticsCompilerResultsReporter.reportDiagnostics(allFirDiagnostics, messageCollector) + val hasErrors = FirDiagnosticsCompilerResultsReporter.reportDiagnostics(allKtDiagnostics, messageCollector) return if (syntaxErrors || hasErrors) null else FirResult(session, scopeSession, fir) } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/diagnostics/FirJvmDefaultErrorMessages.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/diagnostics/FirJvmDefaultErrorMessages.kt index 661b397b658..bd259f01fba 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/diagnostics/FirJvmDefaultErrorMessages.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/diagnostics/FirJvmDefaultErrorMessages.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.STRING import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_TYPE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.SYMBOL -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.TO_STRING +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.TO_STRING import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.CONCURRENT_HASH_MAP_CONTAINS_OPERATOR import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.CONFLICTING_JVM_DECLARATIONS import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors.DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt index b34e8c3e605..1281f6792f8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/context/CheckerContext.kt @@ -5,21 +5,24 @@ package org.jetbrains.kotlin.fir.analysis.checkers.context +import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.diagnostics.Severity -import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticContext +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.expressions.FirGetClassCall import org.jetbrains.kotlin.fir.expressions.FirStatement +import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.resolve.ImplicitReceiverStack import org.jetbrains.kotlin.fir.resolve.SessionHolder import org.jetbrains.kotlin.fir.resolve.calls.ImplicitReceiverValue import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator import org.jetbrains.kotlin.name.Name -abstract class CheckerContext { +abstract class CheckerContext : DiagnosticContext { // Services abstract val sessionHolder: SessionHolder abstract val returnTypeCalculator: ReturnTypeCalculator @@ -40,13 +43,6 @@ abstract class CheckerContext { val session: FirSession get() = sessionHolder.session - abstract fun addSuppressedDiagnostics( - diagnosticNames: Collection, - allInfosSuppressed: Boolean, - allWarningsSuppressed: Boolean, - allErrorsSuppressed: Boolean - ): CheckerContext - abstract fun addImplicitReceiver(name: Name?, value: ImplicitReceiverValue<*>): CheckerContext abstract fun addDeclaration(declaration: FirDeclaration): CheckerContext @@ -74,7 +70,7 @@ abstract class CheckerContext { abstract fun dropAnnotationContainer() - fun isDiagnosticSuppressed(diagnostic: FirDiagnostic): Boolean { + override fun isDiagnosticSuppressed(diagnostic: KtDiagnostic): Boolean { val factory = diagnostic.factory val name = factory.name val suppressedByAll = when (factory.severity) { @@ -85,6 +81,9 @@ abstract class CheckerContext { return suppressedByAll || name in suppressedDiagnostics } + + override val languageVersionSettings: LanguageVersionSettings + get() = session.languageVersionSettings } /** diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegateUsesExtensionPropertyTypeParameterChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegateUsesExtensionPropertyTypeParameterChecker.kt index ae9e43d9821..22704c55efc 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegateUsesExtensionPropertyTypeParameterChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegateUsesExtensionPropertyTypeParameterChecker.kt @@ -6,16 +6,19 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration import org.jetbrains.kotlin.config.LanguageFeature +import org.jetbrains.kotlin.diagnostics.DiagnosticReporter +import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory0 +import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticFactory0 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol -import org.jetbrains.kotlin.fir.types.* +import org.jetbrains.kotlin.fir.types.ConeKotlinType +import org.jetbrains.kotlin.fir.types.coneType +import org.jetbrains.kotlin.fir.types.toSymbol +import org.jetbrains.kotlin.fir.types.type import org.jetbrains.kotlin.utils.addToStdlib.safeAs object FirDelegateUsesExtensionPropertyTypeParameterChecker : FirPropertyChecker() { @@ -31,7 +34,7 @@ object FirDelegateUsesExtensionPropertyTypeParameterChecker : FirPropertyChecker } } - private fun getProperDiagnostic(context: CheckerContext): FirDiagnosticFactory0 { + private fun getProperDiagnostic(context: CheckerContext): KtDiagnosticFactory0 { val reportAsError = context.session.languageVersionSettings.supportsFeature( LanguageFeature.ForbidUsingExtensionPropertyTypeParameterInDelegate ) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExplicitBackingFieldForbiddenChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExplicitBackingFieldForbiddenChecker.kt index 2a895cbf38a..9260ff163f4 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExplicitBackingFieldForbiddenChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExplicitBackingFieldForbiddenChecker.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.findClosestClassOrObject import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticFactory0 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticFactory0 import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirBackingField import org.jetbrains.kotlin.fir.declarations.FirResolvedDeclarationStatus @@ -44,7 +44,7 @@ object FirExplicitBackingFieldForbiddenChecker : FirBackingFieldChecker() { } } - private fun getProperDiagnostic(context: CheckerContext): FirDiagnosticFactory0 { + private fun getProperDiagnostic(context: CheckerContext): KtDiagnosticFactory0 { return if (context.findClosestClassOrObject()?.classKind == ClassKind.INTERFACE) { FirErrors.EXPLICIT_BACKING_FIELD_IN_INTERFACE } else { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt index 0f6d34ddce8..6bb0d9c1674 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest import org.jetbrains.kotlin.fir.analysis.checkers.getActualTargetList import org.jetbrains.kotlin.fir.analysis.checkers.getModifierList import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticFactory2 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticFactory2 import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPrimaryConstructor @@ -174,7 +174,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() { context: CheckerContext, reporter: DiagnosticReporter ): Boolean { - fun checkModifier(factory: FirDiagnosticFactory2): Boolean { + fun checkModifier(factory: KtDiagnosticFactory2): Boolean { val map = when (factory) { FirErrors.WRONG_MODIFIER_TARGET -> possibleTargetMap FirErrors.DEPRECATED_MODIFIER_FOR_TARGET -> deprecatedTargetMap diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt index bd03bb6914b..e5ada831e0e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.fir.analysis.checkers.ConstantArgumentKind import org.jetbrains.kotlin.fir.analysis.checkers.checkConstantArguments import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticFactory0 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticFactory0 import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.findArgumentByName import org.jetbrains.kotlin.fir.expressions.* @@ -58,9 +58,9 @@ object FirAnnotationArgumentChecker : FirAnnotationCallChecker() { session: FirSession, reporter: DiagnosticReporter, context: CheckerContext - ): FirDiagnosticFactory0? { + ): KtDiagnosticFactory0? { - fun checkArgumentList(args: FirArgumentList): FirDiagnosticFactory0? { + fun checkArgumentList(args: FirArgumentList): KtDiagnosticFactory0? { var usedNonConst = false for (arg in args.arguments) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt index 2dfc787c69e..69add8ad852 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirForLoopChecker.kt @@ -93,10 +93,10 @@ object FirForLoopChecker : FirBlockChecker() { reporter: DiagnosticReporter, reportSource: KtSourceElement?, context: CheckerContext, - ambiguityFactory: FirDiagnosticFactory1>>, - missingFactory: FirDiagnosticFactory0, - noneApplicableFactory: FirDiagnosticFactory1>>? = null, - unsafeCallFactory: FirDiagnosticFactory0? = null, + ambiguityFactory: KtDiagnosticFactory1>>, + missingFactory: KtDiagnosticFactory0, + noneApplicableFactory: KtDiagnosticFactory1>>? = null, + unsafeCallFactory: KtDiagnosticFactory0? = null, ): Boolean { when (val calleeReference = call.calleeReference) { is FirErrorNamedReference -> { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt index 3b067cc181e..a0c97e9176e 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirReifiedChecker.kt @@ -52,7 +52,7 @@ object FirReifiedChecker : FirQualifiedAccessExpressionChecker() { return } - var factory: FirDiagnosticFactory1? = null + var factory: KtDiagnosticFactory1? = null lateinit var symbol: FirTypeParameterSymbol if (typeArgument is ConeTypeParameterType) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirExplicitApiDeclarationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirExplicitApiDeclarationChecker.kt index 0fa1c4e8f75..d48812a9b77 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirExplicitApiDeclarationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirExplicitApiDeclarationChecker.kt @@ -5,16 +5,18 @@ package org.jetbrains.kotlin.fir.analysis.checkers.syntax +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.KtRealSourceElementKind +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.config.AnalysisFlags import org.jetbrains.kotlin.config.ExplicitApiMode import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.diagnostics.DiagnosticReporter +import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember -import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors -import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.analysis.getChild import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPrimaryConstructor @@ -31,16 +33,16 @@ object FirExplicitApiDeclarationChecker : FirDeclarationSyntaxChecker val diagnostic = - if (context.session.languageVersionSettings.supportsFeature(LanguageFeature.ProhibitTypeParametersForLocalVariables)) + if (context.languageVersionSettings.supportsFeature(LanguageFeature.ProhibitTypeParametersForLocalVariables)) FirErrors.LOCAL_VARIABLE_WITH_TYPE_PARAMETERS else FirErrors.LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING reporter.reportOn(source, diagnostic, context) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirRedundantLabelChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirRedundantLabelChecker.kt index 7e307159602..a75cd73f9d8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirRedundantLabelChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/syntax/FirRedundantLabelChecker.kt @@ -9,13 +9,17 @@ import com.intellij.lang.LighterASTNode import com.intellij.openapi.util.Ref import com.intellij.psi.PsiElement import com.intellij.util.diff.FlyweightCapableTreeStructure -import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.* import org.jetbrains.kotlin.descriptors.EffectiveVisibility -import org.jetbrains.kotlin.fir.* +import org.jetbrains.kotlin.diagnostics.DiagnosticReporter +import org.jetbrains.kotlin.diagnostics.findChildByType +import org.jetbrains.kotlin.diagnostics.reportOn +import org.jetbrains.kotlin.diagnostics.unwrapParenthesesLabelsAndAnnotations +import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.analysis.buildChildSourceElement import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol -import org.jetbrains.kotlin.fir.analysis.diagnostics.* +import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.effectiveVisibility import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -26,14 +30,14 @@ import org.jetbrains.kotlin.psi.* object FirRedundantLabelChecker : FirDeclarationSyntaxChecker() { override fun checkLightTree( element: FirDeclaration, - source: FirLightSourceElement, + source: KtLightSourceElement, context: CheckerContext, reporter: DiagnosticReporter ) { // Local declarations are already checked when the containing declaration is checked. if (!isRootLabelContainer(element)) return - val allTraversalRoots = mutableSetOf() + val allTraversalRoots = mutableSetOf() // First collect all labels in the declaration element.accept(object : FirVisitorVoid() { @@ -68,22 +72,22 @@ object FirRedundantLabelChecker : FirDeclarationSyntaxChecker.reportRedundantLabels( reporter: DiagnosticReporter, context: CheckerContext, - source: FirLightSourceElement, - allTraversalRoots: Set, + source: KtLightSourceElement, + allTraversalRoots: Set, isChildNode: Boolean = false, ) { if (isChildNode && source in allTraversalRoots) return // Prevent double traversal @@ -113,7 +117,7 @@ object FirRedundantLabelChecker : FirDeclarationSyntaxChecker false diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt index eaf4929068f..4a979b59bdc 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt @@ -341,6 +341,6 @@ abstract class AbstractDiagnosticCollectorVisitor( allInfosSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_INFOS in arguments, allWarningsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_WARNINGS in arguments, allErrorsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_ERRORS in arguments - ) + ) as CheckerContext } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt index e1431d2d2da..59796b5651b 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/FirDiagnosticsCollector.kt @@ -7,10 +7,6 @@ package org.jetbrains.kotlin.fir.analysis.collectors import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.collectors.components.DiagnosticComponentsFactory -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic -import org.jetbrains.kotlin.fir.analysis.diagnostics.impl.DiagnosticReporterWithSuppress -import org.jetbrains.kotlin.fir.analysis.diagnostics.impl.SimpleDiagnosticReporter -import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.resolve.ScopeSession object FirDiagnosticsCollector { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt index e77f44c1d74..e16de75d342 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/DiagnosticReporter.kt @@ -5,226 +5,21 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics -import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.FirAnnotationContainer -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.collectors.AbstractDiagnosticCollector -import org.jetbrains.kotlin.fir.languageVersionSettings +import org.jetbrains.kotlin.config.LanguageVersionSettings + +interface DiagnosticContext { + fun isDiagnosticSuppressed(diagnostic: KtDiagnostic): Boolean + + fun addSuppressedDiagnostics( + diagnosticNames: Collection, + allInfosSuppressed: Boolean, + allWarningsSuppressed: Boolean, + allErrorsSuppressed: Boolean + ): DiagnosticContext + + val languageVersionSettings: LanguageVersionSettings +} abstract class DiagnosticReporter { - abstract fun report(diagnostic: FirDiagnostic?, context: CheckerContext) + abstract fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) } - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactory0, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - source?.let { report(factory.on(it, positioningStrategy), context) } -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactory1, - a: A, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - source?.let { report(factory.on(it, a, positioningStrategy), context) } -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactory2, - a: A, - b: B, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - source?.let { report(factory.on(it, a, b, positioningStrategy), context) } -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactory3, - a: A, - b: B, - c: C, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - source?.let { report(factory.on(it, a, b, c, positioningStrategy), context) } -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactory4, - a: A, - b: B, - c: C, - d: D, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - source?.let { report(factory.on(it, a, b, c, d, positioningStrategy), context) } -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactoryForDeprecation0, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - reportOn(source, factory.chooseFactory(context), context, positioningStrategy) -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactoryForDeprecation1, - a: A, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - reportOn(source, factory.chooseFactory(context), a, context, positioningStrategy) -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactoryForDeprecation2, - a: A, - b: B, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - reportOn(source, factory.chooseFactory(context), a, b, context, positioningStrategy) -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactoryForDeprecation3, - a: A, - b: B, - c: C, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - reportOn(source, factory.chooseFactory(context), a, b, c, context, positioningStrategy) -} - -@OptIn(InternalDiagnosticFactoryMethod::class) -fun DiagnosticReporter.reportOn( - source: KtSourceElement?, - factory: FirDiagnosticFactoryForDeprecation4, - a: A, - b: B, - c: C, - d: D, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - reportOn(source, factory.chooseFactory(context), a, b, c, d, context, positioningStrategy) -} - -fun FirDiagnosticFactoryForDeprecation.chooseFactory(context: CheckerContext): F { - return if (context.session.languageVersionSettings.supportsFeature(deprecatingFeature)) { - errorFactory - } else { - warningFactory - } -} - -fun DiagnosticReporter.reportOnWithSuppression( - element: FirAnnotationContainer, - factory: FirDiagnosticFactory0, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - withSuppressedDiagnostics(element, context) { - reportOn(element.source, factory, it, positioningStrategy) - } -} - -fun DiagnosticReporter.reportOnWithSuppression( - element: FirAnnotationContainer, - factory: FirDiagnosticFactory1, - a: A, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - withSuppressedDiagnostics(element, context) { - reportOn(element.source, factory, a, it, positioningStrategy) - } -} - -fun DiagnosticReporter.reportOnWithSuppression( - element: FirAnnotationContainer, - factory: FirDiagnosticFactory2, - a: A, - b: B, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - withSuppressedDiagnostics(element, context) { - reportOn(element.source, factory, a, b, it, positioningStrategy) - } -} - -fun DiagnosticReporter.reportOnWithSuppression( - element: FirAnnotationContainer, - factory: FirDiagnosticFactory3, - a: A, - b: B, - c: C, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - withSuppressedDiagnostics(element, context) { - reportOn(element.source, factory, a, b, c, it, positioningStrategy) - } -} - -fun DiagnosticReporter.reportOnWithSuppression( - element: FirAnnotationContainer, - factory: FirDiagnosticFactory4, - a: A, - b: B, - c: C, - d: D, - context: CheckerContext, - positioningStrategy: SourceElementPositioningStrategy? = null -) { - withSuppressedDiagnostics(element, context) { - reportOn(element.source, factory, a, b, c, d, it, positioningStrategy) - } -} - -inline fun withSuppressedDiagnostics( - annotationContainer: FirAnnotationContainer, - context: CheckerContext, - f: (CheckerContext) -> Unit -) { - val arguments = AbstractDiagnosticCollector.getDiagnosticsSuppressedForContainer(annotationContainer) - if (arguments != null) { - f( - context.addSuppressedDiagnostics( - arguments, - allInfosSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_INFOS in arguments, - allWarningsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_WARNINGS in arguments, - allErrorsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_ERRORS in arguments - ) - ) - return - } - f(context) -} - diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt index f8ddc796251..9b2c8953b3d 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt @@ -11,25 +11,18 @@ import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.STRING import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers.commaSeparated import org.jetbrains.kotlin.diagnostics.rendering.LanguageFeatureMessageRenderer import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.AMBIGUOUS_CALLS -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.COLLECTION import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.DECLARATION_NAME -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.EMPTY import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.FIR import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.FQ_NAMES_IN_TYPES -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.FUNCTION_PARAMETERS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.MODULE_DATA import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.NAME_OF_CONTAINING_DECLARATION_OR_FILE -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.NOT_RENDERED -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.NULLABLE_STRING import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_CLASS_OR_OBJECT import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_CLASS_OR_OBJECT_NAME import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_COLLECTION_OF_TYPES import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.RENDER_TYPE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.SYMBOL import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.SYMBOLS -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.TO_STRING import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.VARIABLE_NAME -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.VISIBILITY import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnosticRenderers.WHEN_MISSING_CASES import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED @@ -521,21 +514,28 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.WRONG_MODIFIER_TA import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.WRONG_NUMBER_OF_TYPE_ARGUMENTS import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.WRONG_SETTER_PARAMETER_TYPE import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.WRONG_SETTER_RETURN_TYPE +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.COLLECTION +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.EMPTY +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.FUNCTION_PARAMETERS +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.NOT_RENDERED +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.NULLABLE_STRING +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.TO_STRING +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticRenderers.VISIBILITY @Suppress("unused") class FirDefaultErrorMessages { companion object { - fun getRendererForDiagnostic(diagnostic: FirDiagnostic): FirDiagnosticRenderer { + fun getRendererForDiagnostic(diagnostic: KtDiagnostic): KtDiagnosticRenderer { val factory = diagnostic.factory @Suppress("UNCHECKED_CAST") - return (MAP[factory] ?: factory.firRenderer) + return (MAP[factory] ?: factory.ktRenderer) } // * - The old FE reports these diagnostics with additional parameters // & - New diagnostic that has no analogues in the old FE // + - Better message required // # - The new diagnostic differs from the old FE's one - val MAP = FirDiagnosticFactoryToRendererMap("FIR").also { map -> + val MAP = KtDiagnosticFactoryToRendererMap("FIR").also { map -> // Meta-errors map.put(UNSUPPORTED, "Unsupported [{0}]", TO_STRING) map.put(UNSUPPORTED_FEATURE, "{0}", LanguageFeatureMessageRenderer(LanguageFeatureMessageRenderer.Type.UNSUPPORTED)) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticParameterRenderer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticParameterRenderer.kt deleted file mode 100644 index cd21638cc6b..00000000000 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticParameterRenderer.kt +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.fir.analysis.diagnostics - -fun interface FirDiagnosticParameterRenderer { - fun render(obj: O): String -} diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt index 1513dbe8f8f..e1ad565c2d3 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt @@ -5,9 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.diagnostics.WhenMissingCase import org.jetbrains.kotlin.diagnostics.rendering.ContextIndependentParameterRenderer import org.jetbrains.kotlin.diagnostics.rendering.Renderer @@ -24,8 +22,6 @@ import org.jetbrains.kotlin.fir.types.render import org.jetbrains.kotlin.name.CallableId object FirDiagnosticRenderers { - val NULLABLE_STRING = Renderer { it ?: "null" } - val SYMBOL = Renderer { symbol: FirBasedSymbol<*> -> when (symbol) { is FirClassLikeSymbol<*> -> symbol.classId.asString() @@ -35,7 +31,7 @@ object FirDiagnosticRenderers { } } - val SYMBOLS = COLLECTION(SYMBOL) + val SYMBOLS = KtDiagnosticRenderers.COLLECTION(SYMBOL) val RENDER_COLLECTION_OF_TYPES = Renderer { types: Collection -> types.joinToString(separator = ", ") { type -> @@ -43,12 +39,6 @@ object FirDiagnosticRenderers { } } - val TO_STRING = Renderer { element: Any? -> - element.toString() - } - - val EMPTY = Renderer { _: Any? -> "" } - val VARIABLE_NAME = Renderer { symbol: FirVariableSymbol<*> -> symbol.name.asString() } @@ -57,10 +47,6 @@ object FirDiagnosticRenderers { element.render() } - val VISIBILITY = Renderer { visibility: Visibility -> - visibility.externalDisplayName - } - val DECLARATION_NAME = Renderer { symbol: FirBasedSymbol<*> -> val name = when (symbol) { is FirCallableSymbol<*> -> symbol.name @@ -127,12 +113,6 @@ object FirDiagnosticRenderers { } } - val NOT_RENDERED = Renderer { - "" - } - - val FUNCTION_PARAMETERS = Renderer { hasValueParameters: Boolean -> if (hasValueParameters) "..." else "" } - val MODULE_DATA = Renderer { "Module ${it.name}" } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticReportHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticReportHelpers.kt new file mode 100644 index 00000000000..d0608064272 --- /dev/null +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticReportHelpers.kt @@ -0,0 +1,224 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir.analysis.diagnostics + +import org.jetbrains.kotlin.KtSourceElement +import org.jetbrains.kotlin.fir.FirAnnotationContainer +import org.jetbrains.kotlin.fir.analysis.collectors.AbstractDiagnosticCollector + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactory0, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + source?.let { report(factory.on(it, positioningStrategy), context) } +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactory1, + a: A, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + source?.let { report(factory.on(it, a, positioningStrategy), context) } +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactory2, + a: A, + b: B, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + source?.let { report(factory.on(it, a, b, positioningStrategy), context) } +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactory3, + a: A, + b: B, + c: C, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + source?.let { report(factory.on(it, a, b, c, positioningStrategy), context) } +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactory4, + a: A, + b: B, + c: C, + d: D, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + source?.let { report(factory.on(it, a, b, c, d, positioningStrategy), context) } +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactoryForDeprecation0, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + reportOn(source, factory.chooseFactory(context), context, positioningStrategy) +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactoryForDeprecation1, + a: A, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + reportOn(source, factory.chooseFactory(context), a, context, positioningStrategy) +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactoryForDeprecation2, + a: A, + b: B, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + reportOn(source, factory.chooseFactory(context), a, b, context, positioningStrategy) +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactoryForDeprecation3, + a: A, + b: B, + c: C, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + reportOn(source, factory.chooseFactory(context), a, b, c, context, positioningStrategy) +} + +@OptIn(InternalDiagnosticFactoryMethod::class) +fun DiagnosticReporter.reportOn( + source: KtSourceElement?, + factory: KtDiagnosticFactoryForDeprecation4, + a: A, + b: B, + c: C, + d: D, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + reportOn(source, factory.chooseFactory(context), a, b, c, d, context, positioningStrategy) +} + +fun KtDiagnosticFactoryForDeprecation.chooseFactory(context: DiagnosticContext): F { + return if (context.languageVersionSettings.supportsFeature(deprecatingFeature)) { + errorFactory + } else { + warningFactory + } +} + +fun DiagnosticReporter.reportOnWithSuppression( + element: FirAnnotationContainer, + factory: KtDiagnosticFactory0, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + withSuppressedDiagnostics(element, context) { + reportOn(element.source, factory, it, positioningStrategy) + } +} + +fun DiagnosticReporter.reportOnWithSuppression( + element: FirAnnotationContainer, + factory: KtDiagnosticFactory1, + a: A, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + withSuppressedDiagnostics(element, context) { + reportOn(element.source, factory, a, it, positioningStrategy) + } +} + +fun DiagnosticReporter.reportOnWithSuppression( + element: FirAnnotationContainer, + factory: KtDiagnosticFactory2, + a: A, + b: B, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + withSuppressedDiagnostics(element, context) { + reportOn(element.source, factory, a, b, it, positioningStrategy) + } +} + +fun DiagnosticReporter.reportOnWithSuppression( + element: FirAnnotationContainer, + factory: KtDiagnosticFactory3, + a: A, + b: B, + c: C, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + withSuppressedDiagnostics(element, context) { + reportOn(element.source, factory, a, b, c, it, positioningStrategy) + } +} + +fun DiagnosticReporter.reportOnWithSuppression( + element: FirAnnotationContainer, + factory: KtDiagnosticFactory4, + a: A, + b: B, + c: C, + d: D, + context: DiagnosticContext, + positioningStrategy: SourceElementPositioningStrategy? = null +) { + withSuppressedDiagnostics(element, context) { + reportOn(element.source, factory, a, b, c, d, it, positioningStrategy) + } +} + +inline fun withSuppressedDiagnostics( + annotationContainer: FirAnnotationContainer, + context: C, + f: (C) -> Unit +) { + val arguments = AbstractDiagnosticCollector.getDiagnosticsSuppressedForContainer(annotationContainer) + if (arguments != null) { + f( + context.addSuppressedDiagnostics( + arguments, + allInfosSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_INFOS in arguments, + allWarningsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_WARNINGS in arguments, + allErrorsSuppressed = AbstractDiagnosticCollector.SUPPRESS_ALL_ERRORS in arguments + ) as C + ) + return + } + f(context) +} + diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnostic.kt similarity index 61% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnostic.kt index 644d9df119f..dfa3d80e818 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnostic.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnostic.kt @@ -15,10 +15,10 @@ import org.jetbrains.kotlin.diagnostics.* // ------------------------------ diagnostics ------------------------------ -sealed class FirDiagnostic : DiagnosticMarker { +sealed class KtDiagnostic : DiagnosticMarker { abstract val element: KtSourceElement abstract val severity: Severity - abstract val factory: AbstractFirDiagnosticFactory + abstract val factory: AbstractKtDiagnosticFactory abstract val positioningStrategy: SourceElementPositioningStrategy val textRanges: List @@ -31,40 +31,40 @@ sealed class FirDiagnostic : DiagnosticMarker { get() = factory.name } -sealed class FirSimpleDiagnostic : FirDiagnostic() { - abstract override val factory: FirDiagnosticFactory0 +sealed class KtSimpleDiagnostic : KtDiagnostic() { + abstract override val factory: KtDiagnosticFactory0 } -sealed class FirDiagnosticWithParameters1 : FirDiagnostic(), DiagnosticWithParameters1Marker { +sealed class KtDiagnosticWithParameters1 : KtDiagnostic(), DiagnosticWithParameters1Marker { abstract override val a: A - abstract override val factory: FirDiagnosticFactory1 + abstract override val factory: KtDiagnosticFactory1 } -sealed class FirDiagnosticWithParameters2 : FirDiagnostic(), DiagnosticWithParameters2Marker { +sealed class KtDiagnosticWithParameters2 : KtDiagnostic(), DiagnosticWithParameters2Marker { abstract override val a: A abstract override val b: B - abstract override val factory: FirDiagnosticFactory2 + abstract override val factory: KtDiagnosticFactory2 } -sealed class FirDiagnosticWithParameters3 : FirDiagnostic(), DiagnosticWithParameters3Marker { +sealed class KtDiagnosticWithParameters3 : KtDiagnostic(), DiagnosticWithParameters3Marker { abstract override val a: A abstract override val b: B abstract override val c: C - abstract override val factory: FirDiagnosticFactory3 + abstract override val factory: KtDiagnosticFactory3 } -sealed class FirDiagnosticWithParameters4 : FirDiagnostic(), DiagnosticWithParameters4Marker { +sealed class KtDiagnosticWithParameters4 : KtDiagnostic(), DiagnosticWithParameters4Marker { abstract override val a: A abstract override val b: B abstract override val c: C abstract override val d: D - abstract override val factory: FirDiagnosticFactory4 + abstract override val factory: KtDiagnosticFactory4 } // ------------------------------ psi diagnostics ------------------------------ -interface FirPsiDiagnostic : DiagnosticMarker { - val factory: AbstractFirDiagnosticFactory +interface KtPsiDiagnostic : DiagnosticMarker { + val factory: AbstractKtDiagnosticFactory val element: KtPsiSourceElement val textRanges: List val severity: Severity @@ -78,7 +78,7 @@ interface FirPsiDiagnostic : DiagnosticMarker { private const val CHECK_PSI_CONSISTENCY_IN_DIAGNOSTICS = true -private fun FirPsiDiagnostic.checkPsiTypeConsistency() { +private fun KtPsiDiagnostic.checkPsiTypeConsistency() { if (CHECK_PSI_CONSISTENCY_IN_DIAGNOSTICS) { require(factory.psiType.isInstance(element.psi)) { "${element.psi::class} is not a subtype of ${factory.psiType} for factory $factory" @@ -86,67 +86,67 @@ private fun FirPsiDiagnostic.checkPsiTypeConsistency() { } } -data class FirPsiSimpleDiagnostic( +data class KtPsiSimpleDiagnostic( override val element: KtPsiSourceElement, override val severity: Severity, - override val factory: FirDiagnosticFactory0, + override val factory: KtDiagnosticFactory0, override val positioningStrategy: SourceElementPositioningStrategy -) : FirSimpleDiagnostic(), FirPsiDiagnostic { +) : KtSimpleDiagnostic(), KtPsiDiagnostic { init { checkPsiTypeConsistency() } } -data class FirPsiDiagnosticWithParameters1( +data class KtPsiDiagnosticWithParameters1( override val element: KtPsiSourceElement, override val a: A, override val severity: Severity, - override val factory: FirDiagnosticFactory1, + override val factory: KtDiagnosticFactory1, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters1(), FirPsiDiagnostic { +) : KtDiagnosticWithParameters1(), KtPsiDiagnostic { init { checkPsiTypeConsistency() } } -data class FirPsiDiagnosticWithParameters2( +data class KtPsiDiagnosticWithParameters2( override val element: KtPsiSourceElement, override val a: A, override val b: B, override val severity: Severity, - override val factory: FirDiagnosticFactory2, + override val factory: KtDiagnosticFactory2, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters2(), FirPsiDiagnostic { +) : KtDiagnosticWithParameters2(), KtPsiDiagnostic { init { checkPsiTypeConsistency() } } -data class FirPsiDiagnosticWithParameters3( +data class KtPsiDiagnosticWithParameters3( override val element: KtPsiSourceElement, override val a: A, override val b: B, override val c: C, override val severity: Severity, - override val factory: FirDiagnosticFactory3, + override val factory: KtDiagnosticFactory3, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters3(), FirPsiDiagnostic { +) : KtDiagnosticWithParameters3(), KtPsiDiagnostic { init { checkPsiTypeConsistency() } } -data class FirPsiDiagnosticWithParameters4( +data class KtPsiDiagnosticWithParameters4( override val element: KtPsiSourceElement, override val a: A, override val b: B, override val c: C, override val d: D, override val severity: Severity, - override val factory: FirDiagnosticFactory4, + override val factory: KtDiagnosticFactory4, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters4(), FirPsiDiagnostic { +) : KtDiagnosticWithParameters4(), KtPsiDiagnostic { init { checkPsiTypeConsistency() } @@ -154,55 +154,55 @@ data class FirPsiDiagnosticWithParameters4( // ------------------------------ light tree diagnostics ------------------------------ -interface FirLightDiagnostic : DiagnosticMarker { +interface KtLightDiagnostic : DiagnosticMarker { val element: KtLightSourceElement @Deprecated("Should not be called", level = DeprecationLevel.HIDDEN) override val psiElement: PsiElement - get() = error("psiElement should not be called on FirLightDiagnostic") + get() = error("psiElement should not be called on KtLightDiagnostic") } -data class FirLightSimpleDiagnostic( +data class KtLightSimpleDiagnostic( override val element: KtLightSourceElement, override val severity: Severity, - override val factory: FirDiagnosticFactory0, + override val factory: KtDiagnosticFactory0, override val positioningStrategy: SourceElementPositioningStrategy -) : FirSimpleDiagnostic(), FirLightDiagnostic +) : KtSimpleDiagnostic(), KtLightDiagnostic -data class FirLightDiagnosticWithParameters1( +data class KtLightDiagnosticWithParameters1( override val element: KtLightSourceElement, override val a: A, override val severity: Severity, - override val factory: FirDiagnosticFactory1, + override val factory: KtDiagnosticFactory1, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters1(), FirLightDiagnostic +) : KtDiagnosticWithParameters1(), KtLightDiagnostic -data class FirLightDiagnosticWithParameters2( +data class KtLightDiagnosticWithParameters2( override val element: KtLightSourceElement, override val a: A, override val b: B, override val severity: Severity, - override val factory: FirDiagnosticFactory2, + override val factory: KtDiagnosticFactory2, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters2(), FirLightDiagnostic +) : KtDiagnosticWithParameters2(), KtLightDiagnostic -data class FirLightDiagnosticWithParameters3( +data class KtLightDiagnosticWithParameters3( override val element: KtLightSourceElement, override val a: A, override val b: B, override val c: C, override val severity: Severity, - override val factory: FirDiagnosticFactory3, + override val factory: KtDiagnosticFactory3, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters3(), FirLightDiagnostic +) : KtDiagnosticWithParameters3(), KtLightDiagnostic -data class FirLightDiagnosticWithParameters4( +data class KtLightDiagnosticWithParameters4( override val element: KtLightSourceElement, override val a: A, override val b: B, override val c: C, override val d: D, override val severity: Severity, - override val factory: FirDiagnosticFactory4, + override val factory: KtDiagnosticFactory4, override val positioningStrategy: SourceElementPositioningStrategy -) : FirDiagnosticWithParameters4(), FirLightDiagnostic +) : KtDiagnosticWithParameters4(), KtLightDiagnostic diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactory.kt similarity index 54% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactory.kt index 38f22ec8149..a5e56a9650f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactory.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactory.kt @@ -12,51 +12,51 @@ import kotlin.reflect.KClass @RequiresOptIn("Please use DiagnosticReporter.reportOn method if possible") annotation class InternalDiagnosticFactoryMethod -sealed class AbstractFirDiagnosticFactory( +sealed class AbstractKtDiagnosticFactory( val name: String, val severity: Severity, val defaultPositioningStrategy: SourceElementPositioningStrategy, val psiType: KClass<*> ) { - abstract val firRenderer: FirDiagnosticRenderer + abstract val ktRenderer: KtDiagnosticRenderer override fun toString(): String { return name } } -class FirDiagnosticFactory0( +class KtDiagnosticFactory0( name: String, severity: Severity, defaultPositioningStrategy: SourceElementPositioningStrategy, psiType: KClass<*> -) : AbstractFirDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { - override val firRenderer: FirDiagnosticRenderer = SimpleFirDiagnosticRenderer("") +) : AbstractKtDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { + override val ktRenderer: KtDiagnosticRenderer = SimpleKtDiagnosticRenderer("") @InternalDiagnosticFactoryMethod fun on( element: KtSourceElement, positioningStrategy: SourceElementPositioningStrategy? - ): FirSimpleDiagnostic { + ): KtSimpleDiagnostic { return when (element) { - is KtPsiSourceElement -> FirPsiSimpleDiagnostic( + is KtPsiSourceElement -> KtPsiSimpleDiagnostic( element, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightSimpleDiagnostic(element, severity, this, positioningStrategy ?: defaultPositioningStrategy) + is KtLightSourceElement -> KtLightSimpleDiagnostic(element, severity, this, positioningStrategy ?: defaultPositioningStrategy) else -> incorrectElement(element) } } } -class FirDiagnosticFactory1( +class KtDiagnosticFactory1( name: String, severity: Severity, defaultPositioningStrategy: SourceElementPositioningStrategy, psiType: KClass<*> -) : AbstractFirDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { - override val firRenderer: FirDiagnosticRenderer = FirDiagnosticWithParameters1Renderer( +) : AbstractKtDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { + override val ktRenderer: KtDiagnosticRenderer = KtDiagnosticWithParameters1Renderer( "{0}", - FirDiagnosticRenderers.TO_STRING + KtDiagnosticRenderers.TO_STRING ) @InternalDiagnosticFactoryMethod @@ -64,12 +64,12 @@ class FirDiagnosticFactory1( element: KtSourceElement, a: A, positioningStrategy: SourceElementPositioningStrategy? - ): FirDiagnosticWithParameters1 { + ): KtDiagnosticWithParameters1 { return when (element) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters1( element, a, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> KtLightDiagnosticWithParameters1( element, a, severity, @@ -81,16 +81,16 @@ class FirDiagnosticFactory1( } } -class FirDiagnosticFactory2( +class KtDiagnosticFactory2( name: String, severity: Severity, defaultPositioningStrategy: SourceElementPositioningStrategy, psiType: KClass<*> -) : AbstractFirDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { - override val firRenderer: FirDiagnosticRenderer = FirDiagnosticWithParameters2Renderer( +) : AbstractKtDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { + override val ktRenderer: KtDiagnosticRenderer = KtDiagnosticWithParameters2Renderer( "{0}, {1}", - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING ) @InternalDiagnosticFactoryMethod @@ -99,12 +99,12 @@ class FirDiagnosticFactory2( a: A, b: B, positioningStrategy: SourceElementPositioningStrategy? - ): FirDiagnosticWithParameters2 { + ): KtDiagnosticWithParameters2 { return when (element) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters2( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters2( element, a, b, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters2( + is KtLightSourceElement -> KtLightDiagnosticWithParameters2( element, a, b, @@ -117,17 +117,17 @@ class FirDiagnosticFactory2( } } -class FirDiagnosticFactory3( +class KtDiagnosticFactory3( name: String, severity: Severity, defaultPositioningStrategy: SourceElementPositioningStrategy, psiType: KClass<*> -) : AbstractFirDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { - override val firRenderer: FirDiagnosticRenderer = FirDiagnosticWithParameters3Renderer( +) : AbstractKtDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { + override val ktRenderer: KtDiagnosticRenderer = KtDiagnosticWithParameters3Renderer( "{0}, {1}, {2}", - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING ) @InternalDiagnosticFactoryMethod @@ -137,12 +137,12 @@ class FirDiagnosticFactory3( b: B, c: C, positioningStrategy: SourceElementPositioningStrategy? - ): FirDiagnosticWithParameters3 { + ): KtDiagnosticWithParameters3 { return when (element) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters3( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters3( element, a, b, c, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters3( + is KtLightSourceElement -> KtLightDiagnosticWithParameters3( element, a, b, @@ -156,18 +156,18 @@ class FirDiagnosticFactory3( } } -class FirDiagnosticFactory4( +class KtDiagnosticFactory4( name: String, severity: Severity, defaultPositioningStrategy: SourceElementPositioningStrategy, psiType: KClass<*> -) : AbstractFirDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { - override val firRenderer: FirDiagnosticRenderer = FirDiagnosticWithParameters4Renderer( +) : AbstractKtDiagnosticFactory(name, severity, defaultPositioningStrategy, psiType) { + override val ktRenderer: KtDiagnosticRenderer = KtDiagnosticWithParameters4Renderer( "{0}, {1}, {2}, {3}", - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING, - FirDiagnosticRenderers.TO_STRING + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING, + KtDiagnosticRenderers.TO_STRING ) @InternalDiagnosticFactoryMethod @@ -178,12 +178,12 @@ class FirDiagnosticFactory4( c: C, d: D, positioningStrategy: SourceElementPositioningStrategy? - ): FirDiagnosticWithParameters4 { + ): KtDiagnosticWithParameters4 { return when (element) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters4( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters4( element, a, b, c, d, severity, this, positioningStrategy ?: defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters4( + is KtLightSourceElement -> KtLightDiagnosticWithParameters4( element, a, b, @@ -204,38 +204,38 @@ private fun incorrectElement(element: KtSourceElement): Nothing { // ------------------------------ factories for deprecation ------------------------------ -sealed class FirDiagnosticFactoryForDeprecation( +sealed class KtDiagnosticFactoryForDeprecation( val deprecatingFeature: LanguageFeature, val warningFactory: F, val errorFactory: F ) -class FirDiagnosticFactoryForDeprecation0( +class KtDiagnosticFactoryForDeprecation0( featureForError: LanguageFeature, - warningFactory: FirDiagnosticFactory0, - errorFactory: FirDiagnosticFactory0 -) : FirDiagnosticFactoryForDeprecation(featureForError, warningFactory, errorFactory) + warningFactory: KtDiagnosticFactory0, + errorFactory: KtDiagnosticFactory0 +) : KtDiagnosticFactoryForDeprecation(featureForError, warningFactory, errorFactory) -class FirDiagnosticFactoryForDeprecation1( +class KtDiagnosticFactoryForDeprecation1( featureForError: LanguageFeature, - warningFactory: FirDiagnosticFactory1, - errorFactory: FirDiagnosticFactory1 -) : FirDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) + warningFactory: KtDiagnosticFactory1, + errorFactory: KtDiagnosticFactory1 +) : KtDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) -class FirDiagnosticFactoryForDeprecation2( +class KtDiagnosticFactoryForDeprecation2( featureForError: LanguageFeature, - warningFactory: FirDiagnosticFactory2, - errorFactory: FirDiagnosticFactory2 -) : FirDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) + warningFactory: KtDiagnosticFactory2, + errorFactory: KtDiagnosticFactory2 +) : KtDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) -class FirDiagnosticFactoryForDeprecation3( +class KtDiagnosticFactoryForDeprecation3( featureForError: LanguageFeature, - warningFactory: FirDiagnosticFactory3, - errorFactory: FirDiagnosticFactory3 -) : FirDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) + warningFactory: KtDiagnosticFactory3, + errorFactory: KtDiagnosticFactory3 +) : KtDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) -class FirDiagnosticFactoryForDeprecation4( +class KtDiagnosticFactoryForDeprecation4( featureForError: LanguageFeature, - warningFactory: FirDiagnosticFactory4, - errorFactory: FirDiagnosticFactory4 -) : FirDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) + warningFactory: KtDiagnosticFactory4, + errorFactory: KtDiagnosticFactory4 +) : KtDiagnosticFactoryForDeprecation>(featureForError, warningFactory, errorFactory) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryDsl.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryDsl.kt similarity index 73% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryDsl.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryDsl.kt index 8e5b9908d9b..07d77888280 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticFactoryDsl.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryDsl.kt @@ -114,8 +114,8 @@ class DiagnosticFactory0DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty { - return DummyDelegate(FirDiagnosticFactory0(prop.name, severity, positioningStrategy, psiType)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty { + return DummyDelegate(KtDiagnosticFactory0(prop.name, severity, positioningStrategy, psiType)) } } @@ -124,8 +124,8 @@ class DiagnosticFactory1DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - return DummyDelegate(FirDiagnosticFactory1(prop.name, severity, positioningStrategy, psiType)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + return DummyDelegate(KtDiagnosticFactory1(prop.name, severity, positioningStrategy, psiType)) } } @@ -134,8 +134,8 @@ class DiagnosticFactory2DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - return DummyDelegate(FirDiagnosticFactory2(prop.name, severity, positioningStrategy, psiType)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + return DummyDelegate(KtDiagnosticFactory2(prop.name, severity, positioningStrategy, psiType)) } } @@ -144,8 +144,8 @@ class DiagnosticFactory3DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - return DummyDelegate(FirDiagnosticFactory3(prop.name, severity, positioningStrategy, psiType)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + return DummyDelegate(KtDiagnosticFactory3(prop.name, severity, positioningStrategy, psiType)) } } @@ -154,8 +154,8 @@ class DiagnosticFactory4DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - return DummyDelegate(FirDiagnosticFactory4(prop.name, severity, positioningStrategy, psiType)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + return DummyDelegate(KtDiagnosticFactory4(prop.name, severity, positioningStrategy, psiType)) } } @@ -167,10 +167,10 @@ class DeprecationDiagnosticFactory0DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty { - val errorFactory = FirDiagnosticFactory0("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) - val warningFactory = FirDiagnosticFactory0("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) - return DummyDelegate(FirDiagnosticFactoryForDeprecation0(featureForError, warningFactory, errorFactory)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty { + val errorFactory = KtDiagnosticFactory0("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) + val warningFactory = KtDiagnosticFactory0("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) + return DummyDelegate(KtDiagnosticFactoryForDeprecation0(featureForError, warningFactory, errorFactory)) } } @@ -179,10 +179,10 @@ class DeprecationDiagnosticFactory1DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - val errorFactory = FirDiagnosticFactory1("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) - val warningFactory = FirDiagnosticFactory1("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) - return DummyDelegate(FirDiagnosticFactoryForDeprecation1(featureForError, warningFactory, errorFactory)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + val errorFactory = KtDiagnosticFactory1("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) + val warningFactory = KtDiagnosticFactory1("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) + return DummyDelegate(KtDiagnosticFactoryForDeprecation1(featureForError, warningFactory, errorFactory)) } } @@ -191,10 +191,10 @@ class DeprecationDiagnosticFactory2DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - val errorFactory = FirDiagnosticFactory2("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) - val warningFactory = FirDiagnosticFactory2("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) - return DummyDelegate(FirDiagnosticFactoryForDeprecation2(featureForError, warningFactory, errorFactory)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + val errorFactory = KtDiagnosticFactory2("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) + val warningFactory = KtDiagnosticFactory2("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) + return DummyDelegate(KtDiagnosticFactoryForDeprecation2(featureForError, warningFactory, errorFactory)) } } @@ -203,10 +203,10 @@ class DeprecationDiagnosticFactory3DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - val errorFactory = FirDiagnosticFactory3("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) - val warningFactory = FirDiagnosticFactory3("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) - return DummyDelegate(FirDiagnosticFactoryForDeprecation3(featureForError, warningFactory, errorFactory)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + val errorFactory = KtDiagnosticFactory3("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) + val warningFactory = KtDiagnosticFactory3("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) + return DummyDelegate(KtDiagnosticFactoryForDeprecation3(featureForError, warningFactory, errorFactory)) } } @@ -215,10 +215,10 @@ class DeprecationDiagnosticFactory4DelegateProvider( private val positioningStrategy: SourceElementPositioningStrategy, private val psiType: KClass<*> ) { - operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { - val errorFactory = FirDiagnosticFactory4("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) - val warningFactory = FirDiagnosticFactory4("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) - return DummyDelegate(FirDiagnosticFactoryForDeprecation4(featureForError, warningFactory, errorFactory)) + operator fun provideDelegate(thisRef: Any?, prop: KProperty<*>): ReadOnlyProperty> { + val errorFactory = KtDiagnosticFactory4("${prop.name}$ERROR", Severity.ERROR, positioningStrategy, psiType) + val warningFactory = KtDiagnosticFactory4("${prop.name}$WARNING", Severity.WARNING, positioningStrategy, psiType) + return DummyDelegate(KtDiagnosticFactoryForDeprecation4(featureForError, warningFactory, errorFactory)) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryToRendererMap.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryToRendererMap.kt index 22cac3df39f..0db116e2cbf 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryToRendererMap.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticFactoryToRendererMap.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -7,105 +7,105 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticParameterRenderer -class FirDiagnosticFactoryToRendererMap(val name: String) { - private val renderersMap: MutableMap = mutableMapOf() +class KtDiagnosticFactoryToRendererMap(val name: String) { + private val renderersMap: MutableMap = mutableMapOf() - operator fun get(factory: AbstractFirDiagnosticFactory): FirDiagnosticRenderer? = renderersMap[factory] + operator fun get(factory: AbstractKtDiagnosticFactory): KtDiagnosticRenderer? = renderersMap[factory] - fun put(factory: FirDiagnosticFactory0, message: String) { - put(factory, SimpleFirDiagnosticRenderer(message)) + fun put(factory: KtDiagnosticFactory0, message: String) { + put(factory, SimpleKtDiagnosticRenderer(message)) } fun put( - factory: FirDiagnosticFactory1, + factory: KtDiagnosticFactory1, message: String, rendererA: DiagnosticParameterRenderer? ) { - put(factory, FirDiagnosticWithParameters1Renderer(message, rendererA)) + put(factory, KtDiagnosticWithParameters1Renderer(message, rendererA)) } fun put( - factory: FirDiagnosticFactory2, + factory: KtDiagnosticFactory2, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer? ) { - put(factory, FirDiagnosticWithParameters2Renderer(message, rendererA, rendererB)) + put(factory, KtDiagnosticWithParameters2Renderer(message, rendererA, rendererB)) } fun put( - factory: FirDiagnosticFactory3, + factory: KtDiagnosticFactory3, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer?, rendererC: DiagnosticParameterRenderer? ) { - put(factory, FirDiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC)) + put(factory, KtDiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC)) } fun put( - factory: FirDiagnosticFactory4, + factory: KtDiagnosticFactory4, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer?, rendererC: DiagnosticParameterRenderer?, rendererD: DiagnosticParameterRenderer? ) { - put(factory, FirDiagnosticWithParameters4Renderer(message, rendererA, rendererB, rendererC, rendererD)) + put(factory, KtDiagnosticWithParameters4Renderer(message, rendererA, rendererB, rendererC, rendererD)) } - fun put(factory: FirDiagnosticFactoryForDeprecation0, message: String) { - put(factory.errorFactory, SimpleFirDiagnosticRenderer(message)) - put(factory.warningFactory, SimpleFirDiagnosticRenderer(factory.warningMessage(message))) + fun put(factory: KtDiagnosticFactoryForDeprecation0, message: String) { + put(factory.errorFactory, SimpleKtDiagnosticRenderer(message)) + put(factory.warningFactory, SimpleKtDiagnosticRenderer(factory.warningMessage(message))) } fun put( - factory: FirDiagnosticFactoryForDeprecation1, + factory: KtDiagnosticFactoryForDeprecation1, message: String, rendererA: DiagnosticParameterRenderer? ) { - put(factory.errorFactory, FirDiagnosticWithParameters1Renderer(message, rendererA)) - put(factory.warningFactory, FirDiagnosticWithParameters1Renderer(factory.warningMessage(message), rendererA)) + put(factory.errorFactory, KtDiagnosticWithParameters1Renderer(message, rendererA)) + put(factory.warningFactory, KtDiagnosticWithParameters1Renderer(factory.warningMessage(message), rendererA)) } fun put( - factory: FirDiagnosticFactoryForDeprecation2, + factory: KtDiagnosticFactoryForDeprecation2, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer? ) { - put(factory.errorFactory, FirDiagnosticWithParameters2Renderer(message, rendererA, rendererB)) - put(factory.warningFactory, FirDiagnosticWithParameters2Renderer(factory.warningMessage(message), rendererA, rendererB)) + put(factory.errorFactory, KtDiagnosticWithParameters2Renderer(message, rendererA, rendererB)) + put(factory.warningFactory, KtDiagnosticWithParameters2Renderer(factory.warningMessage(message), rendererA, rendererB)) } fun put( - factory: FirDiagnosticFactoryForDeprecation3, + factory: KtDiagnosticFactoryForDeprecation3, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer?, rendererC: DiagnosticParameterRenderer? ) { - put(factory.errorFactory, FirDiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC)) - put(factory.warningFactory, FirDiagnosticWithParameters3Renderer(factory.warningMessage(message), rendererA, rendererB, rendererC)) + put(factory.errorFactory, KtDiagnosticWithParameters3Renderer(message, rendererA, rendererB, rendererC)) + put(factory.warningFactory, KtDiagnosticWithParameters3Renderer(factory.warningMessage(message), rendererA, rendererB, rendererC)) } fun put( - factory: FirDiagnosticFactoryForDeprecation4, + factory: KtDiagnosticFactoryForDeprecation4, message: String, rendererA: DiagnosticParameterRenderer?, rendererB: DiagnosticParameterRenderer?, rendererC: DiagnosticParameterRenderer?, rendererD: DiagnosticParameterRenderer? ) { - put(factory.errorFactory, FirDiagnosticWithParameters4Renderer(message, rendererA, rendererB, rendererC, rendererD)) - put(factory.warningFactory, FirDiagnosticWithParameters4Renderer(factory.warningMessage(message), rendererA, rendererB, rendererC, rendererD)) + put(factory.errorFactory, KtDiagnosticWithParameters4Renderer(message, rendererA, rendererB, rendererC, rendererD)) + put(factory.warningFactory, KtDiagnosticWithParameters4Renderer(factory.warningMessage(message), rendererA, rendererB, rendererC, rendererD)) } - private fun put(factory: AbstractFirDiagnosticFactory, renderer: FirDiagnosticRenderer) { + private fun put(factory: AbstractKtDiagnosticFactory, renderer: KtDiagnosticRenderer) { renderersMap[factory] = renderer } - private fun FirDiagnosticFactoryForDeprecation<*>.warningMessage(errorMessage: String): String { + private fun KtDiagnosticFactoryForDeprecation<*>.warningMessage(errorMessage: String): String { return buildString { append(errorMessage) append(". This will become an error") diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderer.kt similarity index 62% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderer.kt index 997a0789fd9..37475ae5269 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderer.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderer.kt @@ -10,52 +10,52 @@ import org.jetbrains.kotlin.diagnostics.rendering.RenderingContext import org.jetbrains.kotlin.diagnostics.rendering.renderParameter import java.text.MessageFormat -sealed interface FirDiagnosticRenderer { - fun render(diagnostic: FirDiagnostic): String - fun renderParameters(diagnostic: FirDiagnostic): Array +sealed interface KtDiagnosticRenderer { + fun render(diagnostic: KtDiagnostic): String + fun renderParameters(diagnostic: KtDiagnostic): Array } -class SimpleFirDiagnosticRenderer(private val message: String) : FirDiagnosticRenderer { - override fun render(diagnostic: FirDiagnostic): String { - require(diagnostic is FirSimpleDiagnostic) +class SimpleKtDiagnosticRenderer(private val message: String) : KtDiagnosticRenderer { + override fun render(diagnostic: KtDiagnostic): String { + require(diagnostic is KtSimpleDiagnostic) return message } - override fun renderParameters(diagnostic: FirDiagnostic): Array { - require(diagnostic is FirSimpleDiagnostic) + override fun renderParameters(diagnostic: KtDiagnostic): Array { + require(diagnostic is KtSimpleDiagnostic) return emptyArray() } } -sealed class AbstractFirDiagnosticWithParametersRenderer( +sealed class AbstractKtDiagnosticWithParametersRenderer( protected val message: String -) : FirDiagnosticRenderer { +) : KtDiagnosticRenderer { private val messageFormat = MessageFormat(message) - final override fun render(diagnostic: FirDiagnostic): String { + final override fun render(diagnostic: KtDiagnostic): String { return messageFormat.format(renderParameters(diagnostic)) } } -class FirDiagnosticWithParameters1Renderer( +class KtDiagnosticWithParameters1Renderer( message: String, private val rendererForA: DiagnosticParameterRenderer?, -) : AbstractFirDiagnosticWithParametersRenderer(message) { - override fun renderParameters(diagnostic: FirDiagnostic): Array { - require(diagnostic is FirDiagnosticWithParameters1<*>) +) : AbstractKtDiagnosticWithParametersRenderer(message) { + override fun renderParameters(diagnostic: KtDiagnostic): Array { + require(diagnostic is KtDiagnosticWithParameters1<*>) val context = RenderingContext.of(diagnostic.a) @Suppress("UNCHECKED_CAST") return arrayOf(renderParameter(diagnostic.a as A, rendererForA, context)) } } -class FirDiagnosticWithParameters2Renderer( +class KtDiagnosticWithParameters2Renderer( message: String, private val rendererForA: DiagnosticParameterRenderer?, private val rendererForB: DiagnosticParameterRenderer?, -) : AbstractFirDiagnosticWithParametersRenderer(message) { - override fun renderParameters(diagnostic: FirDiagnostic): Array { - require(diagnostic is FirDiagnosticWithParameters2<*, *>) +) : AbstractKtDiagnosticWithParametersRenderer(message) { + override fun renderParameters(diagnostic: KtDiagnostic): Array { + require(diagnostic is KtDiagnosticWithParameters2<*, *>) val context = RenderingContext.of(diagnostic.a, diagnostic.b) @Suppress("UNCHECKED_CAST") return arrayOf( @@ -65,14 +65,14 @@ class FirDiagnosticWithParameters2Renderer( } } -class FirDiagnosticWithParameters3Renderer( +class KtDiagnosticWithParameters3Renderer( message: String, private val rendererForA: DiagnosticParameterRenderer?, private val rendererForB: DiagnosticParameterRenderer?, private val rendererForC: DiagnosticParameterRenderer?, -) : AbstractFirDiagnosticWithParametersRenderer(message) { - override fun renderParameters(diagnostic: FirDiagnostic): Array { - require(diagnostic is FirDiagnosticWithParameters3<*, *, *>) +) : AbstractKtDiagnosticWithParametersRenderer(message) { + override fun renderParameters(diagnostic: KtDiagnostic): Array { + require(diagnostic is KtDiagnosticWithParameters3<*, *, *>) val context = RenderingContext.of(diagnostic.a, diagnostic.b, diagnostic.c) @Suppress("UNCHECKED_CAST") return arrayOf( @@ -83,15 +83,15 @@ class FirDiagnosticWithParameters3Renderer( } } -class FirDiagnosticWithParameters4Renderer( +class KtDiagnosticWithParameters4Renderer( message: String, private val rendererForA: DiagnosticParameterRenderer?, private val rendererForB: DiagnosticParameterRenderer?, private val rendererForC: DiagnosticParameterRenderer?, private val rendererForD: DiagnosticParameterRenderer?, -) : AbstractFirDiagnosticWithParametersRenderer(message) { - override fun renderParameters(diagnostic: FirDiagnostic): Array { - require(diagnostic is FirDiagnosticWithParameters4<*, *, *, *>) +) : AbstractKtDiagnosticWithParametersRenderer(message) { + override fun renderParameters(diagnostic: KtDiagnostic): Array { + require(diagnostic is KtDiagnosticWithParameters4<*, *, *, *>) val context = RenderingContext.of(diagnostic.a, diagnostic.b, diagnostic.c, diagnostic.d) @Suppress("UNCHECKED_CAST") return arrayOf( diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderers.kt new file mode 100644 index 00000000000..d4d8fc67339 --- /dev/null +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/KtDiagnosticRenderers.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.fir.analysis.diagnostics + +import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.diagnostics.rendering.ContextIndependentParameterRenderer +import org.jetbrains.kotlin.diagnostics.rendering.Renderer + +object KtDiagnosticRenderers { + val NULLABLE_STRING = Renderer { it ?: "null" } + + val TO_STRING = Renderer { element: Any? -> + element.toString() + } + + val EMPTY = Renderer { _: Any? -> "" } + + val VISIBILITY = Renderer { visibility: Visibility -> + visibility.externalDisplayName + } + + val NOT_RENDERED = Renderer { + "" + } + + val FUNCTION_PARAMETERS = Renderer { hasValueParameters: Boolean -> if (hasValueParameters) "..." else "" } + + @Suppress("FunctionName") + fun COLLECTION(renderer: ContextIndependentParameterRenderer): ContextIndependentParameterRenderer> { + return Renderer { list -> + list.joinToString(prefix = "[", postfix = "]", separator = ", ", limit = 3, truncated = "...") { + renderer.render(it) + } + } + } +} diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt index 827fccda975..7a18a8338b6 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategies.kt @@ -11,9 +11,9 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.TokenSet import com.intellij.util.diff.FlyweightCapableTreeStructure -import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeType import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.diagnostics.PositioningStrategies import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens.MODALITY_MODIFIERS @@ -968,21 +968,21 @@ object LightTreePositioningStrategies { } val UNREACHABLE_CODE: LightTreePositioningStrategy = object : LightTreePositioningStrategy() { - override fun markFirDiagnostic(element: KtSourceElement, diagnostic: FirDiagnostic): List { + override fun markKtDiagnostic(element: KtSourceElement, diagnostic: KtDiagnostic): List { @Suppress("UNCHECKED_CAST") - val typed = diagnostic as FirDiagnosticWithParameters2, Set> + val typed = diagnostic as KtDiagnosticWithParameters2, Set> with(UnreachableCodeLightTreeHelper(element.treeStructure)) { val reachable = typed.a.map { it.lighterASTNode }.toSet() val unreachable = typed.b.map { it.lighterASTNode }.toSet() if (!element.lighterASTNode.hasChildrenInSet(reachable)) { - return super.markFirDiagnostic(element, diagnostic) + return super.markKtDiagnostic(element, diagnostic) } val nodesToMark = element.lighterASTNode.getLeavesOrReachableChildren(reachable, unreachable) .removeReachableElementsWithMeaninglessSiblings(reachable) if (nodesToMark.isEmpty()) { - return super.markFirDiagnostic(element, diagnostic) + return super.markKtDiagnostic(element, diagnostic) } val ranges = nodesToMark.flatMap { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt index adff810badc..202c74fbaeb 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.lexer.KtTokens.WHITE_SPACE open class LightTreePositioningStrategy { - open fun markFirDiagnostic(element: KtSourceElement, diagnostic: FirDiagnostic): List { + open fun markKtDiagnostic(element: KtSourceElement, diagnostic: KtDiagnostic): List { return mark(element.lighterASTNode, element.startOffset, element.endOffset, element.treeStructure) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/PsiPositioningStrategies.kt similarity index 86% rename from compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt rename to compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/PsiPositioningStrategies.kt index ba99cee894a..60b63ee6744 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirPsiPositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/PsiPositioningStrategies.kt @@ -17,12 +17,12 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamedDeclaration -object FirPsiPositioningStrategies { +object PsiPositioningStrategies { val UNREACHABLE_CODE = object : PositioningStrategy() { override fun markDiagnostic(diagnostic: DiagnosticMarker): List { - //todo it is better to implement arguments extraction in FirDiagnosticFactory, but kotlin struggle with checking types in it atm + //todo it is better to implement arguments extraction in KtDiagnosticFactory, but kotlin struggle with checking types in it atm @Suppress("UNCHECKED_CAST") - val typed = diagnostic as FirDiagnosticWithParameters2, Set> + val typed = diagnostic as KtDiagnosticWithParameters2, Set> val source = diagnostic.element as KtPsiSourceElement return UnreachableCode.getUnreachableTextRanges( source.psi as KtElement, @@ -34,7 +34,7 @@ object FirPsiPositioningStrategies { val ACTUAL_DECLARATION_NAME = object : PositioningStrategy() { override fun markDiagnostic(diagnostic: DiagnosticMarker): List { - require(diagnostic is FirDiagnostic) + require(diagnostic is KtDiagnostic) val element = diagnostic.element.psi ?: return emptyList() (element as? KtNamedDeclaration)?.nameIdentifier?.let { nameIdentifier -> return mark(nameIdentifier) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategies.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategies.kt index 0b958d0044d..f2caa5fc557 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategies.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategies.kt @@ -279,12 +279,12 @@ object SourceElementPositioningStrategies { val UNREACHABLE_CODE = SourceElementPositioningStrategy( LightTreePositioningStrategies.UNREACHABLE_CODE, - FirPsiPositioningStrategies.UNREACHABLE_CODE + PsiPositioningStrategies.UNREACHABLE_CODE ) val ACTUAL_DECLARATION_NAME = SourceElementPositioningStrategy( LightTreePositioningStrategies.ACTUAL_DECLARATION_NAME, - FirPsiPositioningStrategies.ACTUAL_DECLARATION_NAME + PsiPositioningStrategies.ACTUAL_DECLARATION_NAME ) val LABEL = SourceElementPositioningStrategy( diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt index fc598f82603..a760f59de7b 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/SourceElementPositioningStrategy.kt @@ -16,10 +16,10 @@ class SourceElementPositioningStrategy( private val lightTreeStrategy: LightTreePositioningStrategy, private val psiStrategy: PositioningStrategy<*> ) { - fun markDiagnostic(diagnostic: FirDiagnostic): List { + fun markDiagnostic(diagnostic: KtDiagnostic): List { return when (val element = diagnostic.element) { is KtPsiSourceElement -> psiStrategy.markDiagnostic(diagnostic) - is KtLightSourceElement -> lightTreeStrategy.markFirDiagnostic(element, diagnostic) + is KtLightSourceElement -> lightTreeStrategy.markKtDiagnostic(element, diagnostic) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt index 8891c837c40..9206914a5e1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics import org.jetbrains.kotlin.KtFakeSourceElementKind -import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.KtNodeTypes +import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember import org.jetbrains.kotlin.fir.analysis.getChild @@ -35,10 +35,10 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.safeAs -private fun ConeDiagnostic.toFirDiagnostic( +private fun ConeDiagnostic.toKtDiagnostic( source: KtSourceElement, qualifiedAccessSource: KtSourceElement? -): FirDiagnostic? = when (this) { +): KtDiagnostic? = when (this) { is ConeUnresolvedReferenceError -> FirErrors.UNRESOLVED_REFERENCE.createOn( source, (this.name ?: SpecialNames.NO_NAME_PROVIDED).asString() @@ -119,11 +119,11 @@ fun ConeDiagnostic.toFirDiagnostics( session: FirSession, source: KtSourceElement, qualifiedAccessSource: KtSourceElement? -): List { +): List { return when (this) { is ConeInapplicableCandidateError -> mapInapplicableCandidateError(session, this, source, qualifiedAccessSource) is ConeConstraintSystemHasContradiction -> mapSystemHasContradictionError(session, this, source, qualifiedAccessSource) - else -> listOfNotNull(toFirDiagnostic(source, qualifiedAccessSource)) + else -> listOfNotNull(toKtDiagnostic(source, qualifiedAccessSource)) } } @@ -132,7 +132,7 @@ private fun mapUnsafeCallError( rootCause: UnsafeCall, source: KtSourceElement, qualifiedAccessSource: KtSourceElement?, -): FirDiagnostic? { +): KtDiagnostic? { if (candidate.callInfo.isImplicitInvoke) { return FirErrors.UNSAFE_IMPLICIT_INVOKE_CALL.createOn(source, rootCause.actualType) } @@ -181,7 +181,7 @@ private fun mapInapplicableCandidateError( diagnostic: ConeInapplicableCandidateError, source: KtSourceElement, qualifiedAccessSource: KtSourceElement?, -): List { +): List { val genericDiagnostic = FirErrors.INAPPLICABLE_CANDIDATE.createOn(source, diagnostic.candidate.symbol) val diagnostics = diagnostic.candidate.diagnostics.filter { it.applicability == diagnostic.applicability }.mapNotNull { rootCause -> when (rootCause) { @@ -245,9 +245,9 @@ private fun mapSystemHasContradictionError( diagnostic: ConeConstraintSystemHasContradiction, source: KtSourceElement, qualifiedAccessSource: KtSourceElement?, -): List { +): List { val errorsToIgnore = mutableSetOf() - return buildList { + return buildList { for (error in diagnostic.candidate.system.errors) { addIfNotNull( error.toDiagnostic( @@ -290,7 +290,7 @@ private fun ConstraintSystemError.toDiagnostic( typeContext: ConeTypeContext, errorsToIgnore: MutableSet, candidate: AbstractCandidate, -): FirDiagnostic? { +): KtDiagnostic? { return when (this) { is NewConstraintError -> { val position = position.from @@ -365,7 +365,7 @@ private fun ConstraintSystemError.toDiagnostic( private val NewConstraintError.lowerConeType: ConeKotlinType get() = lowerType as ConeKotlinType private val NewConstraintError.upperConeType: ConeKotlinType get() = upperType as ConeKotlinType -private fun ConeSimpleDiagnostic.getFactory(source: KtSourceElement): FirDiagnosticFactory0 { +private fun ConeSimpleDiagnostic.getFactory(source: KtSourceElement): KtDiagnosticFactory0 { @Suppress("UNCHECKED_CAST") return when (kind) { DiagnosticKind.Syntax -> FirErrors.SYNTAX @@ -416,46 +416,46 @@ private fun ConeSimpleDiagnostic.getFactory(source: KtSourceElement): FirDiagnos @OptIn(InternalDiagnosticFactoryMethod::class) -private fun FirDiagnosticFactory0.createOn( +private fun KtDiagnosticFactory0.createOn( element: KtSourceElement? -): FirSimpleDiagnostic? { +): KtSimpleDiagnostic? { return element?.let { on(it, positioningStrategy = null) } } @OptIn(InternalDiagnosticFactoryMethod::class) -private fun FirDiagnosticFactory1.createOn( +private fun KtDiagnosticFactory1.createOn( element: KtSourceElement?, a: A -): FirDiagnosticWithParameters1? { +): KtDiagnosticWithParameters1? { return element?.let { on(it, a, positioningStrategy = null) } } @OptIn(InternalDiagnosticFactoryMethod::class) -private fun FirDiagnosticFactory2.createOn( +private fun KtDiagnosticFactory2.createOn( element: KtSourceElement?, a: A, b: B -): FirDiagnosticWithParameters2? { +): KtDiagnosticWithParameters2? { return element?.let { on(it, a, b, positioningStrategy = null) } } @OptIn(InternalDiagnosticFactoryMethod::class) -private fun FirDiagnosticFactory3.createOn( +private fun KtDiagnosticFactory3.createOn( element: KtSourceElement?, a: A, b: B, c: C -): FirDiagnosticWithParameters3? { +): KtDiagnosticWithParameters3? { return element?.let { on(it, a, b, c, positioningStrategy = null) } } @OptIn(InternalDiagnosticFactoryMethod::class) -private fun FirDiagnosticFactory4.createOn( +private fun KtDiagnosticFactory4.createOn( element: KtSourceElement?, a: A, b: B, c: C, d: D -): FirDiagnosticWithParameters4? { +): KtDiagnosticWithParameters4? { return element?.let { on(it, a, b, c, d, positioningStrategy = null) } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/BaseDiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/BaseDiagnosticReporter.kt index 94486bdf220..e3437c52418 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/BaseDiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/BaseDiagnosticReporter.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics.impl import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic abstract class BaseDiagnosticReporter : DiagnosticReporter() { - abstract val diagnostics: List + abstract val diagnostics: List } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt index 993f019d772..79cd2b5bb9a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DeduplicatingDiagnosticReporter.kt @@ -6,16 +6,16 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics.impl import org.jetbrains.kotlin.KtSourceElement -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.diagnostics.AbstractFirDiagnosticFactory +import org.jetbrains.kotlin.fir.analysis.diagnostics.AbstractKtDiagnosticFactory +import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticContext import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic class DeduplicatingDiagnosticReporter(private val inner: DiagnosticReporter) : DiagnosticReporter() { - private val reported = mutableSetOf>() + private val reported = mutableSetOf>() - override fun report(diagnostic: FirDiagnostic?, context: CheckerContext) { + override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) { if (diagnostic != null && reported.add(Pair(diagnostic.element, diagnostic.factory))) { inner.report(diagnostic, context) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DiagnosticReporterWithSuppress.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DiagnosticReporterWithSuppress.kt index bf9d7c2697e..b43d3b5aaea 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DiagnosticReporterWithSuppress.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/DiagnosticReporterWithSuppress.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics.impl -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticContext +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic class DiagnosticReporterWithSuppress : BaseDiagnosticReporter() { - private val _diagnostics: MutableList = mutableListOf() - override val diagnostics: List + private val _diagnostics: MutableList = mutableListOf() + override val diagnostics: List get() = _diagnostics - override fun report(diagnostic: FirDiagnostic?, context: CheckerContext) { + override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) { if (diagnostic == null) return if (!context.isDiagnosticSuppressed(diagnostic)) { _diagnostics += diagnostic diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/SimpleDiagnosticReporter.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/SimpleDiagnosticReporter.kt index 41062349754..b7a534190e1 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/SimpleDiagnosticReporter.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/impl/SimpleDiagnosticReporter.kt @@ -5,15 +5,15 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics.impl -import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticContext +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic class SimpleDiagnosticReporter : BaseDiagnosticReporter() { - private val _diagnostics: MutableList = mutableListOf() - override val diagnostics: List + private val _diagnostics: MutableList = mutableListOf() + override val diagnostics: List get() = _diagnostics - override fun report(diagnostic: FirDiagnostic?, context: CheckerContext) { + override fun report(diagnostic: KtDiagnostic?, context: DiagnosticContext) { if (diagnostic == null) return _diagnostics += diagnostic } diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt index fdabb929f93..060f203dfc4 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.collectors.FirDiagnosticsCollector import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporterFactory -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.backend.Fir2IrConverter import org.jetbrains.kotlin.fir.backend.Fir2IrResult import org.jetbrains.kotlin.fir.backend.jvm.Fir2IrJvmSpecialAnnotationSymbolProvider @@ -34,7 +34,7 @@ import java.io.File abstract class AbstractFirAnalyzerFacade { abstract val scopeSession: ScopeSession - abstract fun runCheckers(): Map> + abstract fun runCheckers(): Map> abstract fun runResolution(): List @@ -55,7 +55,7 @@ class FirAnalyzerFacade( override val scopeSession: ScopeSession get() = _scopeSession!! - private var collectedDiagnostics: Map>? = null + private var collectedDiagnostics: Map>? = null private fun buildRawFir() { if (firFiles != null) return @@ -87,7 +87,7 @@ class FirAnalyzerFacade( } @OptIn(ExperimentalStdlibApi::class) - override fun runCheckers(): Map> { + override fun runCheckers(): Map> { if (_scopeSession == null) runResolution() if (collectedDiagnostics != null) return collectedDiagnostics!! val collector = FirDiagnosticsCollector.create(session, scopeSession) diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/analyse.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/analyse.kt index 64cf72e691f..8e27a0a42bd 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/analyse.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/pipeline/analyse.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.pipeline import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.analysis.collectors.FirDiagnosticsCollector import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporterFactory -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveProcessor @@ -20,7 +20,7 @@ fun FirSession.runResolution(firFiles: List): Pair): Map> { +fun FirSession.runCheckers(scopeSession: ScopeSession, firFiles: List): Map> { val collector = FirDiagnosticsCollector.create(this, scopeSession) return buildMap { for (file in firFiles) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt index 9dfefab2543..4570ff3f17a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticCodeMetaInfo.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.test.frontend.fir.handlers import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.codeMetaInfo.model.CodeMetaInfo import org.jetbrains.kotlin.codeMetaInfo.renderConfigurations.AbstractCodeMetaInfoRenderConfiguration -import org.jetbrains.kotlin.fir.analysis.diagnostics.AbstractFirDiagnosticWithParametersRenderer +import org.jetbrains.kotlin.fir.analysis.diagnostics.AbstractKtDiagnosticWithParametersRenderer import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDefaultErrorMessages -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic object FirMetaInfoUtils { val renderDiagnosticNoArgs = FirDiagnosticCodeMetaRenderConfiguration().apply { renderParams = false } @@ -18,7 +18,7 @@ object FirMetaInfoUtils { } class FirDiagnosticCodeMetaInfo( - val diagnostic: FirDiagnostic, + val diagnostic: KtDiagnostic, renderConfiguration: FirDiagnosticCodeMetaRenderConfiguration, private val range: TextRange ) : CodeMetaInfo { @@ -64,7 +64,7 @@ class FirDiagnosticCodeMetaRenderConfiguration( @Suppress("UNCHECKED_CAST") val renderer = FirDefaultErrorMessages.getRendererForDiagnostic(diagnostic) - if (renderer is AbstractFirDiagnosticWithParametersRenderer) { + if (renderer is AbstractKtDiagnosticWithParametersRenderer) { renderer.renderParameters(diagnostic).mapTo(params, Any?::toString) } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt index 70b70b81328..ab68b1a0947 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt @@ -102,7 +102,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes } } - private fun FirDiagnostic.toMetaInfos( + private fun KtDiagnostic.toMetaInfos( file: TestFile, lightTreeEnabled: Boolean, lightTreeComparingModeEnabled: Boolean, @@ -151,7 +151,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes lightTreeEnabled: Boolean, lightTreeComparingModeEnabled: Boolean ) { - val result = mutableListOf() + val result = mutableListOf() val diagnosedRangesToDiagnosticNames = globalMetadataInfoHandler.getExistingMetaInfosForFile(testFile).groupBy( keySelector = { it.start..it.end }, valueTransform = { it.tag } @@ -201,7 +201,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes fun createExpressionTypeDiagnosticIfExpected( element: FirExpression, diagnosedRangesToDiagnosticNames: Map> - ): FirDiagnosticWithParameters1? = + ): KtDiagnosticWithParameters1? = DebugInfoDiagnosticFactory1.EXPRESSION_TYPE.createDebugInfoDiagnostic(element, diagnosedRangesToDiagnosticNames) { element.typeRef.renderAsString((element as? FirExpressionWithSmartcast)?.takeIf { it.isStable }?.originalType) } @@ -218,7 +218,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes element: FirElement, reference: FirNamedReference, diagnosedRangesToDiagnosticNames: Map> - ): FirDiagnosticWithParameters1? = + ): KtDiagnosticWithParameters1? = DebugInfoDiagnosticFactory1.CALL.createDebugInfoDiagnostic(element, diagnosedRangesToDiagnosticNames) { val resolvedSymbol = (reference as? FirResolvedNamedReference)?.resolvedSymbol val fqName = resolvedSymbol?.fqNameUnsafe() @@ -255,7 +255,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes element: FirElement, diagnosedRangesToDiagnosticNames: Map>, argument: () -> String, - ): FirDiagnosticWithParameters1? { + ): KtDiagnosticWithParameters1? { val sourceElement = element.source ?: return null if (sourceElement.kind !in allowedKindsForDebugInfo) return null @@ -270,16 +270,16 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes } val argumentText = argument() - val factory = FirDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class) + val factory = KtDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class) return when (positionedElement) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters1( positionedElement, argumentText, severity, factory, factory.defaultPositioningStrategy ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> KtLightDiagnosticWithParameters1( positionedElement, argumentText, severity, diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt index e4a7f1230df..3fd6bd35a83 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirBaseDiagnosticsTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils -import org.jetbrains.kotlin.fir.analysis.diagnostics.FirDiagnostic +import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnostic import org.jetbrains.kotlin.fir.builder.BodyBuildingMode import org.jetbrains.kotlin.fir.builder.PsiHandlingMode import org.jetbrains.kotlin.fir.builder.RawFirBuilder @@ -226,7 +226,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() { } protected fun TestFile.getActualText( - firDiagnostics: Iterable, + ktDiagnostics: Iterable, actualText: StringBuilder ): Boolean { val ktFile = this.ktFile @@ -241,7 +241,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() { // TODO: report JVM signature diagnostics also for implementing modules val ok = booleanArrayOf(true) - val diagnostics = firDiagnostics.toActualDiagnostic(ktFile) + val diagnostics = ktDiagnostics.toActualDiagnostic(ktFile) val filteredDiagnostics = diagnostics // TODO actualDiagnostics.addAll(filteredDiagnostics) @@ -338,7 +338,7 @@ abstract class AbstractFirBaseDiagnosticsTest : BaseDiagnosticsTest() { return ok[0] } - private fun Iterable.toActualDiagnostic(root: PsiElement): List { + private fun Iterable.toActualDiagnostic(root: PsiElement): List { val result = mutableListOf() filterIsInstance().mapTo(result) { ActualDiagnostic(it, null, true) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt index ccf3c3c1322..a4796303508 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt @@ -57,7 +57,7 @@ import java.io.File * and it will opens xdot with dump for that test */ @OptIn(SymbolInternals::class) -abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { +abstract class AbstractKtDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { companion object { const val DUMP_CFG_DIRECTIVE = "DUMP_CFG" @@ -118,7 +118,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { for (testFile in testFiles) { val firFile = firFiles.firstOrNull { it.psi == testFile.ktFile } if (firFile != null) { - val debugInfoDiagnostics: List = + val debugInfoDiagnostics: List = collectDebugInfoDiagnostics(firFile, testFile.diagnosedRangesToDiagnosticNames) testFile.getActualText( diagnostics.getValue(firFile) + debugInfoDiagnostics, @@ -135,8 +135,8 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { protected fun collectDebugInfoDiagnostics( firFile: FirFile, diagnosedRangesToDiagnosticNames: MutableMap> - ): List { - val result = mutableListOf() + ): List { + val result = mutableListOf() object : FirDefaultVisitorVoid() { @@ -167,7 +167,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { fun createExpressionTypeDiagnosticIfExpected( element: FirExpression, diagnosedRangesToDiagnosticNames: MutableMap> - ): FirDiagnosticWithParameters1? = + ): KtDiagnosticWithParameters1? = DebugInfoDiagnosticFactory1.EXPRESSION_TYPE.createDebugInfoDiagnostic(element, diagnosedRangesToDiagnosticNames) { element.typeRef.renderAsString((element as? FirExpressionWithSmartcast)?.originalType) } @@ -184,7 +184,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { element: FirElement, reference: FirNamedReference, diagnosedRangesToDiagnosticNames: MutableMap> - ): FirDiagnosticWithParameters1? = + ): KtDiagnosticWithParameters1? = DebugInfoDiagnosticFactory1.CALL.createDebugInfoDiagnostic(element, diagnosedRangesToDiagnosticNames) { val resolvedSymbol = (reference as? FirResolvedNamedReference)?.resolvedSymbol @@ -196,7 +196,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { element: FirElement, diagnosedRangesToDiagnosticNames: MutableMap>, argument: () -> String, - ): FirDiagnosticWithParameters1? { + ): KtDiagnosticWithParameters1? { val sourceElement = element.source ?: return null val sourceKind = sourceElement.kind if (sourceKind !in allowedKindsForDebugInfo) { @@ -212,18 +212,18 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { val argumentText = argument() return when (sourceElement) { - is KtPsiSourceElement -> FirPsiDiagnosticWithParameters1( + is KtPsiSourceElement -> KtPsiDiagnosticWithParameters1( sourceElement, argumentText, severity, - FirDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class), + KtDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class), SourceElementPositioningStrategy.DEFAULT ) - is KtLightSourceElement -> FirLightDiagnosticWithParameters1( + is KtLightSourceElement -> KtLightDiagnosticWithParameters1( sourceElement, argumentText, severity, - FirDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class), + KtDiagnosticFactory1(name, severity, SourceElementPositioningStrategy.DEFAULT, PsiElement::class), SourceElementPositioningStrategy.DEFAULT ) } @@ -263,9 +263,9 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() { } - protected fun collectDiagnostics(firFiles: List): Map> { + protected fun collectDiagnostics(firFiles: List): Map> { val collectors = mutableMapOf() - val result = mutableMapOf>() + val result = mutableMapOf>() for (firFile in firFiles) { val session = firFile.moduleData.session val collector = collectors.computeIfAbsent(session) { createCollector(session) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt index 1e75bfab9ac..7d52d5ad2bc 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirOldFrontendDiagnosticsTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.createAllCompilerResolvePro import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractFirOldFrontendDiagnosticsTest : AbstractFirDiagnosticsTest() { +abstract class AbstractFirOldFrontendDiagnosticsTest : AbstractKtDiagnosticsTest() { override fun createTestFileFromPath(filePath: String): File { val newPath = if (File(filePath).readText().contains("// FIR_IDENTICAL")) filePath else filePath.replace(".kt", ".fir.kt") return File(newPath).also {