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
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/types/KtFe10FunctionalType.kt
+8 -8
View File
@@ -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<KtType>
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)
)
}
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt
+1 -1
View File
@@ -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 {