diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 65f598672cd..657b46c861c 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -253,17 +253,21 @@ open class FirTypeResolveTransformer( shouldNotBeCalled() } - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: Any?): FirStatement = whileAnalysing(session, annotationCall) { + override fun transformAnnotationCall( + annotationCall: FirAnnotationCall, + data: Any? + ): FirStatement = whileAnalysing(session, annotationCall) { when (val originalTypeRef = annotationCall.annotationTypeRef) { is FirResolvedTypeRef -> { when (annotationCall.annotationResolvePhase) { - FirAnnotationResolvePhase.Unresolved -> when (originalTypeRef){ + FirAnnotationResolvePhase.Unresolved -> when (originalTypeRef) { is FirErrorTypeRef -> return annotationCall.also { it.replaceAnnotationResolvePhase(FirAnnotationResolvePhase.Types) } else -> shouldNotBeCalled() } FirAnnotationResolvePhase.CompilerRequiredAnnotations -> { annotationCall.replaceAnnotationResolvePhase(FirAnnotationResolvePhase.Types) - val alternativeResolvedTypeRef = originalTypeRef.delegatedTypeRef?.transformSingle(this, data) ?: return annotationCall + val alternativeResolvedTypeRef = + originalTypeRef.delegatedTypeRef?.transformSingle(this, data) ?: return annotationCall val coneTypeFromCompilerRequiredPhase = originalTypeRef.coneType val coneTypeFromTypesPhase = alternativeResolvedTypeRef.coneType if (coneTypeFromTypesPhase != coneTypeFromCompilerRequiredPhase) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt index fecf2599363..dc43ec29601 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt @@ -47,7 +47,9 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.transformSingle import org.jetbrains.kotlin.name.Name -open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolveTransformerDispatcher) : FirPartialBodyResolveTransformer(transformer) { +open class FirDeclarationsResolveTransformer( + transformer: FirAbstractBodyResolveTransformerDispatcher +) : FirPartialBodyResolveTransformer(transformer) { private val statusResolver: FirStatusResolver = FirStatusResolver(session, scopeSession) private fun FirDeclaration.visibilityForApproximation(): Visibility { @@ -493,7 +495,10 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve ) } - override fun transformRegularClass(regularClass: FirRegularClass, data: ResolutionMode): FirStatement = whileAnalysing(session, regularClass) { + override fun transformRegularClass( + regularClass: FirRegularClass, + data: ResolutionMode + ): FirStatement = whileAnalysing(session, regularClass) { return context.withContainingClass(regularClass) { if (regularClass.isLocal && regularClass !in context.targetedLocalClasses) { return regularClass.runAllPhasesForLocalClass(transformer, components, data, transformer.firTowerDataContextCollector) @@ -628,7 +633,6 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve if (functionIsNotAnalyzed) { dataFlowAnalyzer.enterFunction(function) } - @Suppress("UNCHECKED_CAST") return transformDeclarationContent(function, data).also { if (functionIsNotAnalyzed) { val result = it as FirFunction @@ -638,16 +642,17 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve } as FirStatement } - override fun transformConstructor(constructor: FirConstructor, data: ResolutionMode): FirConstructor = whileAnalysing(session, constructor) { + override fun transformConstructor( + constructor: FirConstructor, + data: ResolutionMode + ): FirConstructor = whileAnalysing(session, constructor) { if (implicitTypeOnly) return constructor val container = context.containerIfAny as? FirRegularClass if (constructor.isPrimary && container?.classKind == ClassKind.ANNOTATION_CLASS) { return withFirArrayOfCallTransformer { - @Suppress("UNCHECKED_CAST") doTransformConstructor(constructor, data) } } - @Suppress("UNCHECKED_CAST") return doTransformConstructor(constructor, data) } @@ -996,7 +1001,10 @@ open class FirDeclarationsResolveTransformer(transformer: FirAbstractBodyResolve return element } - override fun transformValueParameter(valueParameter: FirValueParameter, data: Any?): FirStatement = whileAnalysing(valueParameter.moduleData.session, valueParameter) { + override fun transformValueParameter( + valueParameter: FirValueParameter, + data: Any? + ): FirStatement = whileAnalysing(valueParameter.moduleData.session, valueParameter) { if (valueParameter.returnTypeRef is FirImplicitTypeRef) { valueParameter.replaceReturnTypeRef( valueParameter.returnTypeRef.resolvedTypeFromPrototype(