azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Rename FunctionClassDescriptor#functionKind -> functionTypeKind

Browse Source 
This commit is needed for the following commit.
There we will restore the compatibility API with Android IDEA plugin
This commit is contained in:
Stanislav Erokhin
2023-02-08 11:52:39 +01:00
committed by Space Team
parent a14f3c8cc2
commit bec9ad0f6b
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt
+3 -3
View File
@@ -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<KotlinType> {
// 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
core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
+1 -1
View File
@@ -25,7 +25,7 @@ class FunctionClassScope(
containingClass: FunctionClassDescriptor
) : GivenFunctionsMemberScope(storageManager, containingClass) {
override fun computeDeclaredFunctions(): List<FunctionDescriptor> =
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()