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

Use star-projected types for building ScriptProvidedPropertyDescriptors

Browse Source 
Otherwise, the type parameters of the `kotlin.script.state` property
of type `AggregatedReplStageState` were undefined, which led to
building an ill-formed signature for the script class constructor.
This commit is contained in:
Sergej Jaskiewicz
2023-01-06 14:31:45 +01:00
committed by Space Team
parent 27adfa8370
commit e3a4d6fa56
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
+7 -4
View File
@@ -41,6 +41,7 @@ import org.jetbrains.kotlin.types.TypeSubstitutor
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.types.typeUtil.isNothing
import org.jetbrains.kotlin.types.typeUtil.isUnit
import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import kotlin.reflect.KClass
import kotlin.reflect.KType
@@ -261,12 +262,14 @@ class LazyScriptDescriptor(
private val scriptProvidedProperties: () -> List<ScriptProvidedPropertyDescriptor> = resolveSession.storageManager.createLazyValue {
scriptCompilationConfiguration()[ScriptCompilationConfiguration.providedProperties].orEmpty()
.mapNotNull { (name, type) ->
findTypeDescriptor(getScriptingClass(type), Errors.MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS)
?.let { name.toValidJvmIdentifier() to it.defaultType.makeNullableAsSpecified(type.isNullable) }
}.map { (name, classDescriptor) ->
findTypeDescriptor(getScriptingClass(type), Errors.MISSING_SCRIPT_PROVIDED_PROPERTY_CLASS)?.let {
name.toValidJvmIdentifier() to
it.defaultType.makeNullableAsSpecified(type.isNullable).replaceArgumentsWithStarProjections()
}
}.map { (name, type) ->
ScriptProvidedPropertyDescriptor(
Name.identifier(name),
classDescriptor,
type,
thisAsReceiverParameter,
true,
this