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: refactor script import management

Browse Source 
#KTIJ-34699

GitOrigin-RevId: 6242d7d66fac70d2db3b12e1b146873ff6bcbfa2
This commit is contained in:
Vlad Koshkin
2025-06-26 13:21:50 +00:00
committed by intellij-monorepo-bot
parent 596f44795c
commit f24b68045d
1 changed files with 10 additions and 9 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
+10 -9
View File
@@ -14,7 +14,7 @@ import com.intellij.platform.backend.workspace.toVirtualFileUrl
import com.intellij.platform.backend.workspace.workspaceModel
import com.intellij.platform.ide.progress.withBackgroundProgress
import com.intellij.platform.util.progress.ProgressReporter
import com.intellij.platform.util.progress.reportProgress
import com.intellij.platform.util.progress.reportProgressScope
import com.intellij.platform.workspace.jps.entities.*
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
@@ -40,10 +40,10 @@ import kotlin.script.experimental.jvm.jvm
class MainKtsScriptConfigurationProvider(val project: Project, val coroutineScope: CoroutineScope) : ScriptRefinedConfigurationResolver,
ScriptWorkspaceModelManager {
private val data = ConcurrentHashMap<VirtualFile, ScriptConfigurationWithSdk>()
private val importedScripts = TreeMultimap.create(COMPARATOR, COMPARATOR)
private val importedScriptsTraverser = Traverser.forTree<VirtualFile> { importedScripts.get(it) }
private val visitedScripts = TreeMultimap.create(COMPARATOR, COMPARATOR)
private val visitedScriptsTraverser = Traverser.forTree<VirtualFile> { visitedScripts.get(it) }
fun getImportedScripts(mainKts: VirtualFile): List<VirtualFile> = importedScriptsTraverser.breadthFirst(mainKts) - mainKts
fun getImportedScripts(mainKts: VirtualFile): List<VirtualFile> = visitedScriptsTraverser.breadthFirst(mainKts) - mainKts
var reporter: ProgressReporter? = null
private set
@@ -51,15 +51,16 @@ class MainKtsScriptConfigurationProvider(val project: Project, val coroutineScop
override fun get(virtualFile: VirtualFile): ScriptConfigurationWithSdk? = data[virtualFile]
override fun remove(virtualFile: VirtualFile) {
importedScripts.removeAll(virtualFile)
visitedScripts.removeAll(virtualFile)
data.remove(virtualFile)
}
override suspend fun create(virtualFile: VirtualFile, definition: ScriptDefinition): ScriptConfigurationWithSdk? {
val mainKtsConfiguration = resolveMainKtsConfiguration(virtualFile, definition)
if (mainKtsConfiguration.importedScripts.isNotEmpty()) {
importedScripts.putAll(virtualFile, mainKtsConfiguration.importedScripts)
resolveDeeply(mainKtsConfiguration.importedScripts)
val scriptsToResolve = mainKtsConfiguration.importedScripts - visitedScripts.keys()
if (scriptsToResolve.isNotEmpty()) {
visitedScripts.putAll(virtualFile, scriptsToResolve)
resolveDeeply(scriptsToResolve)
}
data[virtualFile] = mainKtsConfiguration
@@ -88,7 +89,7 @@ class MainKtsScriptConfigurationProvider(val project: Project, val coroutineScop
}
val result = withBackgroundProgress(project, title = KotlinBaseScriptingBundle.message("progress.title.dependency.resolution", mainKts.name)) {
reportProgress {
reportProgressScope {
try {
reporter = it
smartReadAction(project) {