From 61fe70b60089850ea702210de54941688b70d69d Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Mon, 22 Nov 2021 13:35:51 +0300 Subject: [PATCH] Minor. Rename isAnonymousFunction to isFunctionExpression --- .../fir/resolve/inference/ConeConstraintSystemUtilContext.kt | 2 +- .../calls/inference/components/ConstraintSystemUtilContext.kt | 2 +- .../components/PostponedArgumentInputTypesResolver.kt | 4 ++-- .../components/ClassicConstraintSystemUtilContext.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt index 52d4d7a377b..b9a10e0ad28 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConeConstraintSystemUtilContext.kt @@ -81,7 +81,7 @@ object ConeConstraintSystemUtilContext : ConstraintSystemUtilContext { private fun FirAnonymousFunction.collectDeclaredValueParameterTypes(): List = valueParameters.map { it.returnTypeRef.coneTypeSafe() } - override fun PostponedAtomWithRevisableExpectedType.isAnonymousFunction(): Boolean { + override fun PostponedAtomWithRevisableExpectedType.isFunctionExpression(): Boolean { require(this is PostponedResolvedAtom) return this is LambdaWithTypeVariableAsExpectedTypeAtom && !this.atom.anonymousFunction.isLambda } diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintSystemUtilContext.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintSystemUtilContext.kt index 7bf6f7fc79d..f9cf5f73ea2 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintSystemUtilContext.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintSystemUtilContext.kt @@ -27,7 +27,7 @@ interface ConstraintSystemUtilContext { fun createArgumentConstraintPosition(argument: PostponedAtomWithRevisableExpectedType): ArgumentConstraintPosition<*> fun createFixVariableConstraintPosition(variable: TypeVariableMarker, atom: T): FixVariableConstraintPosition fun extractLambdaParameterTypesFromDeclaration(declaration: PostponedAtomWithRevisableExpectedType): List? - fun PostponedAtomWithRevisableExpectedType.isAnonymousFunction(): Boolean + fun PostponedAtomWithRevisableExpectedType.isFunctionExpression(): Boolean fun PostponedAtomWithRevisableExpectedType.isFunctionExpressionWithReceiver(): Boolean fun createTypeVariableForLambdaReturnType(): TypeVariableMarker fun createTypeVariableForLambdaParameterType(argument: PostponedAtomWithRevisableExpectedType, index: Int): TypeVariableMarker diff --git a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/PostponedArgumentInputTypesResolver.kt b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/PostponedArgumentInputTypesResolver.kt index 14a1ceba84c..41e0ce924ea 100644 --- a/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/PostponedArgumentInputTypesResolver.kt +++ b/compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/PostponedArgumentInputTypesResolver.kt @@ -301,7 +301,7 @@ class PostponedArgumentInputTypesResolver( * * TODO: regarding anonymous functions: see info about need for analysis in partial mode in `collectParameterTypesAndBuildNewExpectedTypes` */ - if (areAllParameterTypesSpecified && !isExtensionFunction && !argument.isAnonymousFunction()) + if (areAllParameterTypesSpecified && !isExtensionFunction && !argument.isFunctionExpression()) return null val allParameterTypes = @@ -389,7 +389,7 @@ class PostponedArgumentInputTypesResolver( * * TODO: investigate why we can't do it for anonymous functions in full mode always (see `diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt`) */ - if (completionMode == ConstraintSystemCompletionMode.PARTIAL && !argument.isAnonymousFunction()) + if (completionMode == ConstraintSystemCompletionMode.PARTIAL && !argument.isFunctionExpression()) return@any false if (argument.revisedExpectedType != null) return@any false val parameterTypesInfo = diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ClassicConstraintSystemUtilContext.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ClassicConstraintSystemUtilContext.kt index 425ce344b8b..aacd048dfab 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ClassicConstraintSystemUtilContext.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ClassicConstraintSystemUtilContext.kt @@ -72,7 +72,7 @@ class ClassicConstraintSystemUtilContext( } } - override fun PostponedAtomWithRevisableExpectedType.isAnonymousFunction(): Boolean { + override fun PostponedAtomWithRevisableExpectedType.isFunctionExpression(): Boolean { require(this is ResolvedAtom) return this.atom is FunctionExpression }