From df1719c64ca11964fcd675e9c208454df6c58d50 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 23 Jul 2020 17:30:41 +0300 Subject: [PATCH] Fix incorrect mixed named/positioned arguments in project code ^KT-40404 Fixed --- .../transformers/body/resolve/FirImplicitBodyResolve.kt | 5 ++--- .../kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt index 824fc14e9b0..648b67f63f3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirImplicitBodyResolve.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.resolve.transformers.* -import org.jetbrains.kotlin.fir.resolve.transformers.TransformImplicitType import org.jetbrains.kotlin.fir.resolve.transformers.contracts.runContractResolveForLocalClass import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -87,9 +86,9 @@ fun > F.runContractAndBodiesResolutionForLocalClass( components.session, components.scopeSession, implicitBodyResolveComputationSession, FirResolvePhase.BODY_RESOLVE, - outerBodyResolveContext = newContext, implicitTypeOnly = false, - returnTypeCalculator + returnTypeCalculator, + outerBodyResolveContext = newContext ) val graphBuilder = components.context.dataFlowAnalyzerContext.graphBuilder diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt index 3bd0bd89793..35dcb19fd49 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerLiteralTypeScope.kt @@ -124,7 +124,6 @@ class FirIntegerOperator @FirImplementationDetail constructor( FirDeclarationOrigin.Synthetic, returnTypeRef, receiverTypeRef, - typeParameters = mutableListOf(), valueParameters = mutableListOf(), body = null, status, @@ -133,6 +132,7 @@ class FirIntegerOperator @FirImplementationDetail constructor( kind.operatorName, symbol, annotations = mutableListOf(), + typeParameters = mutableListOf(), ) { enum class Kind(val unary: Boolean, val operatorName: Name) { PLUS(false, OperatorNameConventions.PLUS),