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

[Analysis API FE10] fix suspend function type mapping

Browse Source
This commit is contained in:
Ilya Kirillov
2022-08-05 16:23:43 +02:00
parent 4d5f1dc1bb
commit f39f1da70d
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10TypeSystemCommonBackendContextForTypeMapping.kt
+7 -2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.analysis.api.descriptors.utils
import org.jetbrains.kotlin.builtins.FAKE_CONTINUATION_CLASS_DESCRIPTOR
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor
import org.jetbrains.kotlin.descriptors.*
@@ -14,6 +15,7 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.ClassicTypeSystemContext
import org.jetbrains.kotlin.types.checker.NewTypeVariableConstructor
import org.jetbrains.kotlin.types.error.ErrorTypeConstructor
import org.jetbrains.kotlin.types.error.ErrorTypeKind
import org.jetbrains.kotlin.types.error.ErrorUtils
import org.jetbrains.kotlin.types.model.KotlinTypeMarker
@@ -75,6 +77,9 @@ internal class KtFe10TypeSystemCommonBackendContextForTypeMapping(
}
override fun TypeConstructorMarker.typeWithArguments(arguments: List<KotlinTypeMarker>): SimpleTypeMarker {
if (this is ErrorTypeConstructor) {
return ErrorUtils.createErrorType(kind, this, *formatParams)
}
require(this is TypeConstructor)
require(parameters.size == arguments.size)
@@ -110,10 +115,10 @@ internal class KtFe10TypeSystemCommonBackendContextForTypeMapping(
val continuationFqName = StandardClassIds.Continuation.asSingleFqName()
val foundClasses = resolveSession.getTopLevelClassifierDescriptors(continuationFqName, NoLookupLocation.FROM_IDE)
return foundClasses.firstOrNull()?.typeConstructor
?: ErrorUtils.createErrorTypeConstructor(ErrorTypeKind.NOT_FOUND_FQNAME, continuationFqName.toString())
?: FAKE_CONTINUATION_CLASS_DESCRIPTOR.typeConstructor
}
override fun functionNTypeConstructor(n: Int): TypeConstructorMarker {
return builtIns.getKFunction(n).typeConstructor
return builtIns.getFunction(n).typeConstructor
}
}