From 64cc6d2de045f6d9e3d467b9a65b4a6ed1fbbc24 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 8 Jan 2024 11:09:11 +0100 Subject: [PATCH] minor: labels for script implicit receivers similar to context receivers --- .../services/FirScriptConfigurationExtensionImpl.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt index 680113f322c..2442611a376 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt @@ -196,7 +196,7 @@ class FirScriptConfiguratorExtensionImpl( private fun buildContextReceiverWithFqName(classFqn: FqName, customName: Name? = null) = buildContextReceiver { - typeRef = buildUserTypeRef { + val userTypeRef = buildUserTypeRef { isMarkedNullable = false qualifier.addAll( classFqn.pathSegments().map { @@ -204,9 +204,9 @@ class FirScriptConfiguratorExtensionImpl( } ) } - if (customName != null) { - customLabelName = customName - } + typeRef = userTypeRef + labelNameFromTypeRef = userTypeRef.qualifier.lastOrNull()?.name + customLabelName = customName } private val _knownAnnotationsForSamWithReceiver = hashSetOf()