KTIJ-28122: Sort definitions according to the sources order

GitOrigin-RevId: ce92f860bc1e28bd8efa06b1250e82fb7b6c0f5b
This commit is contained in:
Ilya Muradyan
2023-12-11 03:34:37 +00:00
committed by intellij-monorepo-bot
parent 3754b81bc0
commit bbdbfb23b0
@@ -212,7 +212,10 @@ open class ScriptDefinitionsManager(private val project: Project) : LazyScriptDe
withLocks {
definitionsBySource.putAll(newDefinitionsBySource)
loadedDefinitions = definitionsBySource.values.flattenTo(mutableListOf())
loadedDefinitions = definitionsBySource
.entries
.sortedBy { sources.indexOf(it.key).takeIf { it >= 0 } ?: Int.MAX_VALUE }
.flatMapTo(mutableListOf()) { it.value }
.onEach { it.order = scriptingSettings.getScriptDefinitionOrder(it) }
.sortedBy(ScriptDefinition::order)
.takeIf { it.isNotEmpty() }