From 26441ed64f6ca33215b0938853ac00d729cb77bd Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 5 Mar 2021 16:00:28 -0800 Subject: [PATCH] FIR IDEA: avoid unnecessary type casting --- .../api/fir/generator/HLDiagnosticConverter.kt | 2 +- .../api/fir/diagnostics/KtFirDataClassConverters.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt index 01bdfea3022..2083bc7e944 100644 --- a/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt +++ b/idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt @@ -143,7 +143,7 @@ private object FirToKtConversionCreator { importsToAdd = listOf("org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration") ), FirTypeParameterSymbol::class to HLFunctionCallConversion( - "firSymbolBuilder.buildTypeParameterSymbol({0}.fir as FirTypeParameter)", + "firSymbolBuilder.buildTypeParameterSymbol({0}.fir)", KtTypeParameterSymbol::class.createType(), importsToAdd = listOf("org.jetbrains.kotlin.fir.declarations.FirTypeParameter") ), diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt index d36c7bb1c9b..08d588d5d8a 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt @@ -710,7 +710,7 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.UPPER_BOUND_VIOLATED) { firDiagnostic -> UpperBoundViolatedImpl( - firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir as FirTypeParameter), + firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), firSymbolBuilder.buildKtType(firDiagnostic.b), firDiagnostic as FirPsiDiagnostic<*>, token, @@ -799,14 +799,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.KCLASS_WITH_NULLABLE_TYPE_PARAMETER_IN_SIGNATURE) { firDiagnostic -> KclassWithNullableTypeParameterInSignatureImpl( - firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir as FirTypeParameter), + firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), firDiagnostic as FirPsiDiagnostic<*>, token, ) } add(FirErrors.TYPE_PARAMETER_AS_REIFIED) { firDiagnostic -> TypeParameterAsReifiedImpl( - firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir as FirTypeParameter), + firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), firDiagnostic as FirPsiDiagnostic<*>, token, ) @@ -1292,14 +1292,14 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert } add(FirErrors.TYPE_PARAMETER_IS_NOT_AN_EXPRESSION) { firDiagnostic -> TypeParameterIsNotAnExpressionImpl( - firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir as FirTypeParameter), + firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), firDiagnostic as FirPsiDiagnostic<*>, token, ) } add(FirErrors.TYPE_PARAMETER_ON_LHS_OF_DOT) { firDiagnostic -> TypeParameterOnLhsOfDotImpl( - firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir as FirTypeParameter), + firSymbolBuilder.buildTypeParameterSymbol(firDiagnostic.a.fir), firDiagnostic as FirPsiDiagnostic<*>, token, )