From f501730d86b8a9d138dbd03fc2fe95e363a94b21 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 11 Sep 2019 14:05:08 +0300 Subject: [PATCH] Minor. Reformat Arguments.kt in fir --- .../kotlin/fir/resolve/calls/Arguments.kt | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt index cc4d06a633a..d3c4a9e379e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt @@ -73,7 +73,17 @@ fun resolveArgumentExpression( acceptLambdaAtoms, typeProvider ) - is FirBlock -> resolveBlockArgument(csBuilder, argument, expectedType, expectedTypeRef, sink, isReceiver, isSafeCall, acceptLambdaAtoms, typeProvider) + is FirBlock -> resolveBlockArgument( + csBuilder, + argument, + expectedType, + expectedTypeRef, + sink, + isReceiver, + isSafeCall, + acceptLambdaAtoms, + typeProvider + ) else -> resolvePlainExpressionArgument(csBuilder, argument, expectedType, sink, isReceiver, isSafeCall, typeProvider) } } @@ -103,7 +113,17 @@ private fun resolveBlockArgument( return } for (argument in returnArguments) { - resolveArgumentExpression(csBuilder, argument, expectedType, expectedTypeRef, sink, isReceiver, isSafeCall, acceptLambdaAtoms, typeProvider) + resolveArgumentExpression( + csBuilder, + argument, + expectedType, + expectedTypeRef, + sink, + isReceiver, + isSafeCall, + acceptLambdaAtoms, + typeProvider + ) } } @@ -116,7 +136,15 @@ fun resolveSubCallArgument( isSafeCall: Boolean, typeProvider: (FirExpression) -> FirTypeRef? ) { - val candidate = argument.candidate() ?: return resolvePlainExpressionArgument(csBuilder, argument as FirExpression, expectedType, sink, isReceiver, isSafeCall, typeProvider) + val candidate = argument.candidate() ?: return resolvePlainExpressionArgument( + csBuilder, + argument as FirExpression, + expectedType, + sink, + isReceiver, + isSafeCall, + typeProvider + ) val type = sink.components.returnTypeCalculator.tryCalculateReturnType(candidate.symbol.firUnsafe()).coneTypeUnsafe() val argumentType = candidate.substitutor.substituteOrSelf(type) resolvePlainArgumentType(csBuilder, argumentType, expectedType, sink, isReceiver, isSafeCall) @@ -227,4 +255,4 @@ internal fun FirExpression.getExpectedType( private fun ConeKotlinType.varargElementType(session: FirSession): ConeKotlinType { return this.arrayElementType(session) ?: error("Failed to extract! ${this.render()}!") -} \ No newline at end of file +}