diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KtFe10FunctionalType.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KtFe10FunctionalType.kt index 93bd3333176..1542bff0a6b 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KtFe10FunctionalType.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KtFe10FunctionalType.kt @@ -52,10 +52,10 @@ internal class KtFe10FunctionalType( } override val isSuspend: Boolean - get() = withValidityAssertion { descriptor.functionKind.isSuspendOrKSuspendFunction } + get() = withValidityAssertion { descriptor.functionTypeKind.isSuspendOrKSuspendFunction } override val isReflectType: Boolean - get() = withValidityAssertion { descriptor.functionKind.isReflectType } + get() = withValidityAssertion { descriptor.functionTypeKind.isReflectType } override val arity: Int get() = withValidityAssertion { descriptor.arity } @@ -78,20 +78,20 @@ internal class KtFe10FunctionalType( override val hasReceiver: Boolean get() = withValidityAssertion { - if (descriptor.functionKind.isReflectType) false + if (descriptor.functionTypeKind.isReflectType) false else fe10Type.getReceiverTypeFromFunctionType() != null } override val receiverType: KtType? get() = withValidityAssertion { - if (descriptor.functionKind.isReflectType) null + if (descriptor.functionTypeKind.isReflectType) null else fe10Type.getReceiverTypeFromFunctionType()?.toKtType(analysisContext) } override val parameterTypes: List get() = withValidityAssertion { when { - descriptor.functionKind.isReflectType -> fe10Type.arguments.dropLast(1) + descriptor.functionTypeKind.isReflectType -> fe10Type.arguments.dropLast(1) else -> fe10Type.getValueParameterTypesFromFunctionType() }.map { it.type.toKtType(analysisContext) } } @@ -99,7 +99,7 @@ internal class KtFe10FunctionalType( override val returnType: KtType get() = withValidityAssertion { when { - descriptor.functionKind.isReflectType -> fe10Type.arguments.last().type + descriptor.functionTypeKind.isReflectType -> fe10Type.arguments.last().type else -> fe10Type.getReturnTypeFromFunctionType() }.toKtType(analysisContext) } @@ -107,8 +107,8 @@ internal class KtFe10FunctionalType( override val classId: ClassId get() = withValidityAssertion { ClassId( - descriptor.functionKind.packageFqName, - descriptor.functionKind.numberedClassName(descriptor.arity) + descriptor.functionTypeKind.packageFqName, + descriptor.functionTypeKind.numberedClassName(descriptor.arity) ) } diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt index 4f7c0c74e29..ae6094cb162 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt @@ -61,7 +61,7 @@ internal class KtFe10TypeSystemCommonBackendContextForTypeMapping( override fun SimpleTypeMarker.isSuspendFunction(): Boolean { require(this is SimpleType) val declaration = constructor.declarationDescriptor - return declaration is FunctionClassDescriptor && declaration.functionKind.isSuspendOrKSuspendFunction + return declaration is FunctionClassDescriptor && declaration.functionTypeKind.isSuspendOrKSuspendFunction } override fun SimpleTypeMarker.isKClass(): Boolean { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt index 75e039fee19..9a6c6ebeb42 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt @@ -342,8 +342,8 @@ class KotlinTypeMapper @JvmOverloads constructor( if (classDescriptor is FunctionClassDescriptor) { if (classDescriptor.hasBigArity || - classDescriptor.functionKind == FunctionTypeKind.KFunction || - classDescriptor.functionKind == FunctionTypeKind.KSuspendFunction + classDescriptor.functionTypeKind == FunctionTypeKind.KFunction || + classDescriptor.functionTypeKind == FunctionTypeKind.KSuspendFunction ) { // kotlin.reflect.KFunction{n} is mapped to kotlin.reflect.KFunction (for all n), and // kotlin.Function{n} is mapped to kotlin.jvm.functions.FunctionN (for n > 22). diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SuspendFunctionAsSupertypeChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SuspendFunctionAsSupertypeChecker.kt index 9ecbb484d4e..de35fe3f4d4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SuspendFunctionAsSupertypeChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/SuspendFunctionAsSupertypeChecker.kt @@ -22,14 +22,14 @@ object SuspendFunctionAsSupertypeChecker : DeclarationChecker { val functionalSupertypes = descriptor.getAllSuperClassifiers().filterIsInstance().toList() if (functionalSupertypes.none { - it.functionKind == FunctionTypeKind.SuspendFunction || - it.functionKind == FunctionTypeKind.KSuspendFunction + it.functionTypeKind == FunctionTypeKind.SuspendFunction || + it.functionTypeKind == FunctionTypeKind.KSuspendFunction } ) return if (functionalSupertypes.any { - it.functionKind == FunctionTypeKind.Function || - it.functionKind == FunctionTypeKind.KFunction + it.functionTypeKind == FunctionTypeKind.Function || + it.functionTypeKind == FunctionTypeKind.KFunction } ) { val reportOn = (declaration as? KtClassOrObject)?.getSuperTypeList() ?: declaration diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt index fbdbc452609..dae8e505d8d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.utils.addToStdlib.shouldNotBeCalled class FunctionClassDescriptor( private val storageManager: StorageManager, private val containingDeclaration: PackageFragmentDescriptor, - val functionKind: FunctionTypeKind, + val functionTypeKind: FunctionTypeKind, val arity: Int -) : AbstractClassDescriptor(storageManager, functionKind.numberedClassName(arity)) { +) : AbstractClassDescriptor(storageManager, functionTypeKind.numberedClassName(arity)) { private val typeConstructor = FunctionTypeConstructor() private val memberScope = FunctionClassScope(storageManager, this) @@ -95,7 +95,7 @@ class FunctionClassDescriptor( private inner class FunctionTypeConstructor : AbstractClassTypeConstructor(storageManager) { override fun computeSupertypes(): Collection { // For K{Suspend}Function{n}, add corresponding numbered {Suspend}Function{n} class, e.g. {Suspend}Function2 for K{Suspend}Function2 - val supertypes = when (functionKind) { + val supertypes = when (functionTypeKind) { FunctionTypeKind.Function -> // Function$N <: Function listOf(functionClassId) FunctionTypeKind.KFunction -> // KFunction$N <: KFunction diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt index 425d0765e4f..66b45cbd064 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt @@ -25,7 +25,7 @@ class FunctionClassScope( containingClass: FunctionClassDescriptor ) : GivenFunctionsMemberScope(storageManager, containingClass) { override fun computeDeclaredFunctions(): List = - when ((containingClass as FunctionClassDescriptor).functionKind) { + when ((containingClass as FunctionClassDescriptor).functionTypeKind) { FunctionTypeKind.Function -> listOf(FunctionInvokeDescriptor.create(containingClass, isSuspend = false)) FunctionTypeKind.SuspendFunction -> listOf(FunctionInvokeDescriptor.create(containingClass, isSuspend = true)) else -> emptyList() diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 946b9411407..4b2043526fe 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java @@ -338,7 +338,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { default: { if (descriptor instanceof FunctionClassDescriptor) { FunctionClassDescriptor functionClassDescriptor = (FunctionClassDescriptor) descriptor; - if (functionClassDescriptor.getFunctionKind() == FunctionTypeKind.Function.INSTANCE) { + if (functionClassDescriptor.getFunctionTypeKind() == FunctionTypeKind.Function.INSTANCE) { ClassDescriptor primitivesObject = findPrimitiveClassesObject(context); assert primitivesObject != null; FunctionDescriptor function = DescriptorUtils.getFunctionByName( diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt index f58dceed59b..e3a0b207ac2 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/BuiltInFictitiousFunctionIrClassFactory.kt @@ -168,7 +168,7 @@ internal class BuiltInFictitiousFunctionIrClassFactory( val builtFunctionNClasses get() = builtClassesMap.entries.mapNotNull { (descriptor, irClass) -> with(descriptor) { - if (functionKind == FunctionTypeKind.Function) + if (functionTypeKind == FunctionTypeKind.Function) FunctionalInterface(irClass, descriptor, arity) else null }