From 764361bc42dbfe34b9675a65b04c4f002de36810 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Mon, 20 Sep 2021 16:32:34 +0300 Subject: [PATCH] Format and remove unused imports and variables --- .../kotlin/codegen/binding/CodegenAnnotatingVisitor.java | 1 - .../kotlin/resolve/calls/model/ResolvedCallImpl.java | 1 - .../resolve/calls/tower/KotlinResolutionCallbacksImpl.kt | 8 +++----- .../calls/tower/KotlinToResolvedCallTransformer.kt | 4 +++- .../kotlin/resolve/calls/tower/NewCallArguments.kt | 5 ++--- .../kotlin/resolve/calls/tower/PSICallResolver.kt | 4 +--- .../kotlin/resolve/calls/tower/PSIKotlinCalls.kt | 1 - .../kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt | 4 ++-- .../kotlin/resolve/calls/util/CallResolverUtil.kt | 1 - .../kotlin/resolve/calls/util/resolvedCallUtil.kt | 2 +- .../resolve/calls/components/CompletionModeCalculator.kt | 1 - .../resolve/calls/components/SuspendConversionUtils.kt | 3 +-- .../resolve/calls/components/UnitTypeConversions.kt | 3 +-- .../kotlin/resolve/calls/components/typeConversions.kt | 1 - .../calls/model/CallableReferencesCandidateFactory.kt | 1 - .../kotlin/resolve/calls/model/ResolutionAtoms.kt | 1 - .../kotlin/resolve/calls/model/ResolvedCallAtoms.kt | 5 ----- 17 files changed, 14 insertions(+), 32 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index 97e40739c7c..f1fd04e6cc1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -56,7 +56,6 @@ import org.jetbrains.kotlin.resolve.constants.NullValue; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.RuntimeAssertionsOnDeclarationBodyChecker; import org.jetbrains.kotlin.resolve.sam.SamConstructorDescriptor; -import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.KotlinType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java index 1ca152b4894..261a6b178ab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; import org.jetbrains.kotlin.resolve.calls.util.CallResolverUtilKt; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt index b345fd61df5..42585b37aab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinResolutionCallbacksImpl.kt @@ -41,7 +41,6 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.expressions.DoubleColonExpressionResolver import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.types.expressions.KotlinTypeInfo -import org.jetbrains.kotlin.types.TypeRefinement import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.types.typeUtil.makeNullable import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -243,11 +242,10 @@ class KotlinResolutionCallbacksImpl( } private fun getLastDeparentesizedExpression(psiCallArgument: PSIKotlinCallArgument): KtExpression? { - val lastExpression: KtExpression? - if (psiCallArgument is LambdaKotlinCallArgumentImpl) { - lastExpression = psiCallArgument.ktLambdaExpression.bodyExpression?.statements?.lastOrNull() + val lastExpression = if (psiCallArgument is LambdaKotlinCallArgumentImpl) { + psiCallArgument.ktLambdaExpression.bodyExpression?.statements?.lastOrNull() } else { - lastExpression = (psiCallArgument as FunctionExpressionImpl).ktFunction.bodyExpression?.lastBlockStatementOrThis() + (psiCallArgument as FunctionExpressionImpl).ktFunction.bodyExpression?.lastBlockStatementOrThis() } return KtPsiUtil.deparenthesize(lastExpression) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt index 6a793541d66..fcaeafba765 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/KotlinToResolvedCallTransformer.kt @@ -60,7 +60,6 @@ class KotlinToResolvedCallTransformer( private val smartCastManager: SmartCastManager, private val typeApproximator: TypeApproximator, private val missingSupertypesResolver: MissingSupertypesResolver, - private val upperBoundChecker: UpperBoundChecker, ) { companion object { private val REPORT_MISSING_NEW_INFERENCE_DIAGNOSTIC @@ -171,6 +170,7 @@ class KotlinToResolvedCallTransformer( tracing.bindReference(trace, result) tracing.bindResolvedCall(trace, result) + return result } @@ -181,9 +181,11 @@ class KotlinToResolvedCallTransformer( diagnostics: Collection, ): NewAbstractResolvedCall { val psiKotlinCall = completedCallAtom.atom.psiKotlinCall + return if (psiKotlinCall is PSIKotlinCallForInvoke) { val diagnosticsForVariableCall = if (completedCallAtom.candidateDescriptor is FunctionDescriptor) emptyList() else diagnostics val diagnosticsForFunctionCall = if (completedCallAtom.candidateDescriptor is FunctionDescriptor) diagnostics else emptyList() + @Suppress("UNCHECKED_CAST") NewVariableAsFunctionResolvedCallImpl( createOrGet(psiKotlinCall.variableCall.resolvedCall, trace, resultSubstitutor, diagnosticsForVariableCall), diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt index 49e3256b72a..44c28b544fa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewCallArguments.kt @@ -238,7 +238,7 @@ fun processFunctionalExpression( val expression = ArgumentTypeResolver.getFunctionLiteralArgumentIfAny(argumentExpression, outerCallContext) ?: return null val postponedExpression = if (expression is KtFunctionLiteral) expression.getParentOfType(true) else expression - val lambdaArgument: PSIKotlinCallArgument? = when (postponedExpression) { + val lambdaArgument: PSIKotlinCallArgument = when (postponedExpression) { is KtLambdaExpression -> LambdaKotlinCallArgumentImpl( outerCallContext, valueArgument, startDataFlowInfo, argumentName, postponedExpression, argumentExpression, @@ -251,7 +251,7 @@ fun processFunctionalExpression( val receiverType = resolveType(outerCallContext, postponedExpression.receiverTypeReference, typeResolver) val parametersTypes = resolveParametersTypes(outerCallContext, postponedExpression, typeResolver) ?: emptyArray() val returnType = resolveType(outerCallContext, postponedExpression.typeReference, typeResolver) - ?: if (postponedExpression.hasBlockBody()) builtIns.unitType else null + ?: if (postponedExpression.hasBlockBody()) builtIns.unitType else null FunctionExpressionImpl( outerCallContext, valueArgument, startDataFlowInfo, argumentName, @@ -323,7 +323,6 @@ internal fun createSimplePSICallArgument( dataFlowValueFactory: DataFlowValueFactory, call: Call ): SimplePSIKotlinCallArgument? { - val ktExpression = KtPsiUtil.getLastElementDeparenthesized(valueArgument.getArgumentExpression(), statementFilter) ?: return null val partiallyResolvedCall = ktExpression.getCall(bindingContext)?.let { bindingContext.get(BindingContext.ONLY_RESOLVED_CALL, it)?.result diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt index 27ff742e8af..a1dddc27948 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.resolve.calls.KotlinCallResolver import org.jetbrains.kotlin.resolve.calls.SPECIAL_FUNCTION_NAMES import org.jetbrains.kotlin.resolve.calls.util.isBinaryRemOperator import org.jetbrains.kotlin.resolve.calls.util.* -import org.jetbrains.kotlin.resolve.calls.components.CallableReferenceResolver import org.jetbrains.kotlin.resolve.calls.components.InferenceSession import org.jetbrains.kotlin.resolve.calls.components.PostponedArgumentsAnalyzer import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandidate @@ -73,7 +72,6 @@ class PSICallResolver( private val kotlinConstraintSystemCompleter: KotlinConstraintSystemCompleter, private val deprecationResolver: DeprecationResolver, private val moduleDescriptor: ModuleDescriptor, - private val callableReferenceResolver: CallableReferenceResolver, private val candidateInterceptor: CandidateInterceptor, private val missingSupertypesResolver: MissingSupertypesResolver ) { @@ -497,7 +495,7 @@ class PSICallResolver( } return variableCallArgument.receiver to SimpleCandidateFactory( - callComponents, scopeTower, callForInvoke, createResolutionCallbacks(context), callableReferenceResolver + callComponents, scopeTower, callForInvoke, createResolutionCallbacks(context) ) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSIKotlinCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSIKotlinCalls.kt index 15e34487f9e..82e74956f3b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSIKotlinCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSIKotlinCalls.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategyForInvoke import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.util.OperatorNameConventions -import org.jetbrains.kotlin.utils.addToStdlib.safeAs val KotlinCall.psiKotlinCall: PSIKotlinCall get() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt index 604bdf4b69c..eb97768f22f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt @@ -18,7 +18,6 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator -import org.jetbrains.kotlin.resolve.calls.util.toOldSubstitution import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext import org.jetbrains.kotlin.resolve.calls.commonSuperType import org.jetbrains.kotlin.resolve.calls.components.* @@ -406,12 +405,12 @@ class ResolvedAtomCompleter( ?: callableCandidate.dispatchReceiver?.receiver?.receiverValue val extensionReceiver = recordedDescriptor.extensionReceiverParameter?.value ?: callableCandidate.extensionReceiver?.receiver?.receiverValue - val explicitCallableReceiver = when (callableCandidate.explicitReceiverKind) { ExplicitReceiverKind.DISPATCH_RECEIVER -> dispatchReceiver ExplicitReceiverKind.EXTENSION_RECEIVER -> extensionReceiver else -> null } + return CallableReferenceResultTypeInfo( dispatchReceiver, extensionReceiver, @@ -514,6 +513,7 @@ class ResolvedAtomCompleter( callableReferenceAdaptation: CallableReferenceAdaptation? ) { if (callableReferenceAdaptation == null) return + val callElement = resolvedCall.call.callElement val isUnboundReference = resolvedCall.dispatchReceiver is TransientReceiver diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallResolverUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallResolverUtil.kt index bbc320045c3..b608ce792f6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallResolverUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallResolverUtil.kt @@ -40,7 +40,6 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.types.typeUtil.contains import org.jetbrains.kotlin.utils.SmartList -import kotlin.math.exp enum class ResolveArgumentsMode { RESOLVE_FUNCTION_ARGUMENTS, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/resolvedCallUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/resolvedCallUtil.kt index 6c03140d415..b3e06ae5bb2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/resolvedCallUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/resolvedCallUtil.kt @@ -81,7 +81,7 @@ fun ResolvedCall<*>.getImplicitReceivers(): Collection = private fun ResolvedCall<*>.hasSafeNullableReceiver(context: CallResolutionContext<*>): Boolean { if (!call.isSafeCall()) return false val receiverValue = getExplicitReceiverValue()?.let { context.dataFlowValueFactory.createDataFlowValue(it, context) } - ?: return false + ?: return false return context.dataFlowInfo.getStableNullability(receiverValue).canBeNull() } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CompletionModeCalculator.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CompletionModeCalculator.kt index 2c4bcb01d80..ba68070ff14 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CompletionModeCalculator.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/CompletionModeCalculator.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.resolve.calls.inference.components.ConstraintSystemC import org.jetbrains.kotlin.resolve.calls.inference.components.TrivialConstraintTypeInferenceOracle import org.jetbrains.kotlin.resolve.calls.inference.model.Constraint import org.jetbrains.kotlin.resolve.calls.inference.model.VariableWithConstraints -import org.jetbrains.kotlin.resolve.calls.model.KotlinResolutionCandidate import org.jetbrains.kotlin.resolve.calls.model.PostponedResolvedAtom import org.jetbrains.kotlin.types.AbstractTypeChecker import org.jetbrains.kotlin.types.UnwrappedType diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/SuspendConversionUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/SuspendConversionUtils.kt index bd1f2f45558..923ccbd4885 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/SuspendConversionUtils.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/SuspendConversionUtils.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.resolve.calls.components import org.jetbrains.kotlin.builtins.* -import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.ParameterDescriptor import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandidate import org.jetbrains.kotlin.resolve.calls.model.* @@ -39,7 +38,7 @@ object SuspendTypeConversions : ParameterTypeConversion { argument: KotlinCallArgument, parameter: ParameterDescriptor, expectedParameterType: UnwrappedType - ): UnwrappedType? { + ): UnwrappedType { val nonSuspendParameterType = createFunctionType( candidate.callComponents.builtIns, expectedParameterType.annotations, diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/UnitTypeConversions.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/UnitTypeConversions.kt index ef32e1343b4..9e7cba3b6ad 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/UnitTypeConversions.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/UnitTypeConversions.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.ParameterDescriptor import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandidate import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation import org.jetbrains.kotlin.resolve.calls.model.KotlinCallArgument -import org.jetbrains.kotlin.resolve.calls.model.KotlinResolutionCandidate import org.jetbrains.kotlin.resolve.calls.model.SimpleKotlinCallArgument import org.jetbrains.kotlin.resolve.calls.model.markCandidateForCompatibilityResolve import org.jetbrains.kotlin.types.KotlinType @@ -72,7 +71,7 @@ object UnitTypeConversions : ParameterTypeConversion { argument: KotlinCallArgument, parameter: ParameterDescriptor, expectedParameterType: UnwrappedType - ): UnwrappedType? { + ): UnwrappedType { val nonUnitReturnedParameterType = createFunctionType( candidate.callComponents.builtIns, expectedParameterType.annotations, diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/typeConversions.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/typeConversions.kt index 119caeaa353..e123e1d488e 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/typeConversions.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/typeConversions.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.resolve.calls.components import org.jetbrains.kotlin.descriptors.ParameterDescriptor import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandidate import org.jetbrains.kotlin.resolve.calls.model.KotlinCallArgument -import org.jetbrains.kotlin.resolve.calls.model.KotlinResolutionCandidate import org.jetbrains.kotlin.types.UnwrappedType interface ParameterTypeConversion { diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/CallableReferencesCandidateFactory.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/CallableReferencesCandidateFactory.kt index fac5202f581..945cdedafa6 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/CallableReferencesCandidateFactory.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/CallableReferencesCandidateFactory.kt @@ -48,7 +48,6 @@ class CallableReferencesCandidateFactory( explicitReceiverKind: ExplicitReceiverKind, extensionReceiver: ReceiverValueWithSmartCastInfo? ): CallableReferenceResolutionCandidate { - val dispatchCallableReceiver = towerCandidate.dispatchReceiver?.let { toCallableReceiver(it, explicitReceiverKind == ExplicitReceiverKind.DISPATCH_RECEIVER) } val extensionCallableReceiver = extensionReceiver?.let { toCallableReceiver(it, explicitReceiverKind == ExplicitReceiverKind.EXTENSION_RECEIVER) } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionAtoms.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionAtoms.kt index ce7cecf21d2..e73d9362a02 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionAtoms.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionAtoms.kt @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandida import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.TypeConstructor -import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.UnwrappedType import org.jetbrains.kotlin.types.model.KotlinTypeMarker import org.jetbrains.kotlin.types.typeUtil.unCapture diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallAtoms.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallAtoms.kt index d53a21fb87c..498ce95b23c 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallAtoms.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallAtoms.kt @@ -19,20 +19,15 @@ package org.jetbrains.kotlin.resolve.calls.model import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.resolve.calls.components.* import org.jetbrains.kotlin.resolve.calls.components.candidate.ResolutionCandidate import org.jetbrains.kotlin.resolve.calls.components.candidate.CallableReferenceResolutionCandidate import org.jetbrains.kotlin.resolve.calls.inference.components.FreshVariableNewTypeSubstitutor import org.jetbrains.kotlin.resolve.calls.inference.components.NewTypeSubstitutor -import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintStorage import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintSystemError import org.jetbrains.kotlin.resolve.calls.inference.model.LowerPriorityToPreserveCompatibility -import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImpl import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind -import org.jetbrains.kotlin.resolve.calls.tower.* import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant -import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.UnwrappedType import org.jetbrains.kotlin.utils.SmartList