Scripting: consolidate script name generation

zeesh49 · Dec 13, 2024 · 14b54ba · 14b54ba
1 parent c0a7995
commit 14b54ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/.../fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/.../fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
@@ -1477,11 +1477,5 @@ class FirElementSerializer private constructor(
     }
 }
 
-internal fun scriptClassId(script: FirScript): ClassId {
-    val name = script.name.let {
-        if (it.isSpecial) {
-            NameUtils.getScriptNameForFile(it.asStringStripSpecialMarkers().removePrefix("script-"))
-        } else it
-    }
-    return ClassId(script.symbol.fqName.parentOrNull() ?: FqName.ROOT, name)
-}
+internal fun scriptClassId(script: FirScript): ClassId =
+    ClassId(script.symbol.fqName.parentOrNull() ?: FqName.ROOT, NameUtils.getScriptTargetClassName(script.name))
diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
@@ -86,11 +86,7 @@ internal class ScriptsToClassesLowering(val context: JvmBackendContext) : Module
             startOffset = 0
             endOffset = fileEntry.maxOffset
             origin = IrDeclarationOrigin.SCRIPT_CLASS
-            name = irScript.name.let {
-                if (it.isSpecial) {
-                    NameUtils.getScriptNameForFile(it.asStringStripSpecialMarkers().removePrefix("script-"))
-                } else it
-            }
+            name = NameUtils.getScriptTargetClassName(irScript.name)
             kind = ClassKind.CLASS
             visibility = DescriptorVisibilities.PUBLIC
             modality = Modality.FINAL

diff --git a/core/compiler.common/src/org/jetbrains/kotlin/name/NameUtils.kt b/core/compiler.common/src/org/jetbrains/kotlin/name/NameUtils.kt
@@ -52,6 +52,12 @@ object NameUtils {
     fun getScriptNameForFile(filePath: String): Name =
         Name.identifier(NameUtils.getPackagePartClassNamePrefix(filePath.substringAfterLast('/').substringBeforeLast('.')))
 
+    @JvmStatic
+    fun getScriptTargetClassName(originalName: Name): Name =
+        if (originalName.isSpecial) {
+            getScriptNameForFile(originalName.asStringStripSpecialMarkers().removePrefix("script-"))
+        } else originalName
+
     @JvmStatic
     fun hasName(name: Name) = name != SpecialNames.NO_NAME_PROVIDED && name != SpecialNames.ANONYMOUS