K2 scripting: treat default import similarly to K1

namely, add them to importing scopes directly and according to the
schema used for other implicit imports, rather than adding them
to the regular script file imports. See KT-65982 for explanation.
#KT-65982 fixed

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/FirScriptingCompilerExtensionRegistrar.kt

@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 import org.jetbrains.kotlin.scripting.compiler.plugin.services.Fir2IrScriptConfiguratorExtensionImpl
 import org.jetbrains.kotlin.scripting.compiler.plugin.services.FirScriptConfiguratorExtensionImpl
 import org.jetbrains.kotlin.scripting.compiler.plugin.services.FirScriptDefinitionProviderService
+import org.jetbrains.kotlin.scripting.compiler.plugin.services.FirScriptResolutionConfigurationExtensionImpl
 import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
 import kotlin.script.experimental.host.ScriptingHostConfiguration
 
@@ -28,6 +29,7 @@ class FirScriptingCompilerExtensionRegistrar(
         }
 
         +FirScriptConfiguratorExtensionImpl.getFactory(hostConfiguration)
+        +FirScriptResolutionConfigurationExtensionImpl.getFactory(hostConfiguration)
         +Fir2IrScriptConfiguratorExtensionImpl.getFactory(hostConfiguration)
     }
 }

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt

@@ -50,25 +50,7 @@ class FirScriptConfiguratorExtensionImpl(
     @Suppress("UNUSED_PARAMETER") hostConfiguration: ScriptingHostConfiguration,
 ) : FirScriptConfiguratorExtension(session) {
 
-    @OptIn(SymbolInternals::class)
     override fun FirScriptBuilder.configureContainingFile(fileBuilder: FirFileBuilder) {
-        val sourceFile = fileBuilder.sourceFile ?: return
-        val configuration = getOrLoadConfiguration(sourceFile) ?: run {
-            log.warn("Configuration for ${sourceFile.asString()} wasn't found. FirScriptBuilder wasn't configured.")
-            return
-        }
-
-        configuration[ScriptCompilationConfiguration.defaultImports]?.forEach { defaultImport ->
-            val trimmed = defaultImport.trim()
-            val endsWithStar = trimmed.endsWith("*")
-            val stripped = if (endsWithStar) trimmed.substring(0, trimmed.length - 2) else trimmed
-            val fqName = FqName.fromSegments(stripped.split("."))
-            fileBuilder.imports += buildImport {
-                source = fileBuilder.source?.fakeElement(KtFakeSourceElementKind.ImplicitImport)
-                importedFqName = fqName
-                isAllUnder = endsWithStar
-            }
-        }
     }
 
     @OptIn(SymbolInternals::class)

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptResolutionConfigurationExtensionImpl.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.scripting.compiler.plugin.services
+
+import org.jetbrains.kotlin.KtFakeSourceElementKind
+import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.fakeElement
+import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.FirImport
+import org.jetbrains.kotlin.fir.declarations.FirScript
+import org.jetbrains.kotlin.fir.declarations.builder.buildImport
+import org.jetbrains.kotlin.fir.extensions.FirScriptResolutionConfigurationExtension
+import org.jetbrains.kotlin.fir.resolve.providers.firProvider
+import org.jetbrains.kotlin.name.FqName
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.defaultImports
+import kotlin.script.experimental.host.ScriptingHostConfiguration
+
+class FirScriptResolutionConfigurationExtensionImpl(
+    session: FirSession,
+    @Suppress("UNUSED_PARAMETER") hostConfiguration: ScriptingHostConfiguration
+) : FirScriptResolutionConfigurationExtension(session) {
+    override fun getScriptDefaultImports(script: FirScript): List<FirImport> {
+        val scriptFile = session.firProvider.getFirScriptContainerFile(script.symbol) ?: return emptyList()
+        val scriptSourceFile = scriptFile.sourceFile?.toSourceCode() ?: return emptyList()
+        val compilationConfiguration = session.getScriptCompilationConfiguration(scriptSourceFile, getDefault = { null }) ?: return emptyList()
+
+        return compilationConfiguration.firImportsFromDefaultImports(script.source?.fakeElement(KtFakeSourceElementKind.ImplicitImport))
+    }
+
+    companion object {
+        fun getFactory(hostConfiguration: ScriptingHostConfiguration): Factory {
+            return Factory { session -> FirScriptResolutionConfigurationExtensionImpl(session, hostConfiguration) }
+        }
+    }
+}
+
+private fun ScriptCompilationConfiguration.firImportsFromDefaultImports(sourceElement: KtSourceElement?): List<FirImport> =
+    this[ScriptCompilationConfiguration.defaultImports]?.map { defaultImport ->
+        val trimmed = defaultImport.trim()
+        val endsWithStar = trimmed.endsWith("*")
+        val stripped = if (endsWithStar) trimmed.substring(0, trimmed.length - 2) else trimmed
+        val fqName = FqName.fromSegments(stripped.split("."))
+        buildImport {
+            source = sourceElement
+            importedFqName = fqName
+            isAllUnder = endsWithStar
+        }
+    }.orEmpty()