From ab7ae75f66a66d4e55b1b998af09a1b0ae763e5f Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 7 Jun 2023 14:11:22 +0200 Subject: [PATCH] Remove unused method Note that `yield` was allowed since 1.7.0: KT-27750 --- .../types/expressions/FunctionsTypingVisitor.kt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt index 3a123dcac69..deec2d68ce5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FunctionsTypingVisitor.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.types.expressions import com.google.common.collect.Lists -import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.* import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor @@ -18,11 +17,13 @@ import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.checkReservedPrefixWord import org.jetbrains.kotlin.psi.psiUtil.checkReservedYieldBeforeLambda import org.jetbrains.kotlin.psi.psiUtil.getAnnotationEntries -import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext.EXPECTED_RETURN_TYPE +import org.jetbrains.kotlin.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil import org.jetbrains.kotlin.resolve.calls.context.ContextDependency import org.jetbrains.kotlin.resolve.calls.inference.BuilderInferenceSession import org.jetbrains.kotlin.resolve.calls.inference.model.TypeVariableTypeConstructor @@ -41,7 +42,6 @@ import org.jetbrains.kotlin.types.expressions.typeInfoFactory.createTypeInfo import org.jetbrains.kotlin.types.typeUtil.contains import org.jetbrains.kotlin.types.typeUtil.isUnit import org.jetbrains.kotlin.utils.addIfNotNull -import java.util.* internal class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : ExpressionTypingVisitor(facade) { @@ -195,15 +195,6 @@ internal class FunctionsTypingVisitor(facade: ExpressionTypingInternals) : Expre return components.dataFlowAnalyzer.createCheckedTypeInfo(resultType, context, expression) } - private fun checkReservedYield(context: ExpressionTypingContext, expression: PsiElement) { - checkReservedPrefixWord( - context.trace, - expression, - "yield", - "yield block/lambda. Use 'yield() { ... }' or 'yield(fun...)'" - ) - } - private fun createFunctionLiteralDescriptor( expression: KtLambdaExpression, context: ExpressionTypingContext