MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] K2: refine script import handling by filtering out non-script files

Browse Source 
#KTIJ-33361 Fixed

GitOrigin-RevId: 20f50f6f28a30036fed9473136d1711cfe9ddbef
This commit is contained in:
Vlad Koshkin
2025-07-04 12:52:41 +00:00
committed by intellij-monorepo-bot
parent 6e9bacb07e
commit b32aa2cc92
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/scripting.k2/src/org/jetbrains/kotlin/idea/core/script/k2/configurations/MainKtsScriptConfigurationProvider.kt
+6 -3
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.idea.core.script.k2.modules.ScriptRefinedConfigurati
import org.jetbrains.kotlin.idea.core.script.k2.modules.ScriptWorkspaceModelManager
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.isNonScript
import org.jetbrains.kotlin.scripting.resolve.VirtualFileScriptSource
import org.jetbrains.kotlin.scripting.resolve.refineScriptCompilationConfiguration
import java.io.File
@@ -121,9 +122,11 @@ class MainKtsScriptConfigurationProvider(val project: Project, val coroutineScop
}
}
private val ScriptConfigurationWithSdk.importedScripts
get() = this.scriptConfiguration.valueOrNull()?.importedScripts?.mapNotNull { imported -> (imported as? VirtualFileScriptSource)?.virtualFile }
?: emptyList()
private val ScriptConfigurationWithSdk.importedScripts: List<VirtualFile>
get() {
val importedScripts = this.scriptConfiguration.valueOrNull()?.importedScripts ?: return emptyList()
return importedScripts.mapNotNull { (it as? VirtualFileScriptSource)?.virtualFile }.filterNot { it.isNonScript() }
}
private fun getUpdatedStorage(
project: Project,