MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-12596 Preserve custom order of folders in the

Browse Source 
Run/Debug Configurations

Closes https://github.com/JetBrains/intellij-community/pull/2788

GitOrigin-RevId: 00ab3bfa40c367619573b1b48e66043b97cfd39e
This commit is contained in:
Wojciech Gąsiorek
2024-07-10 09:53:34 +02:00
committed by intellij-monorepo-bot
parent e4bd3e0189
commit 4bb94dc0a5
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platform/execution-impl/src/com/intellij/execution/impl/RunConfigurationListManagerHelper.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("ReplacePutWithAssignment")
package com.intellij.execution.impl
@@ -9,6 +9,7 @@ import com.intellij.execution.configurations.ConfigurationType
import com.intellij.execution.configurations.RunConfiguration
import com.intellij.execution.configurations.UnknownConfigurationType
import com.intellij.openapi.util.text.NaturalComparator
import it.unimi.dsi.fastutil.objects.Object2IntMap
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
import org.jdom.Element
@@ -169,7 +170,7 @@ internal class RunConfigurationListManagerHelper(private val manager: RunManager
private fun doCustomSort() {
val list = idToSettings.values.toTypedArray()
val folderNames = getSortedFolderNames(idToSettings.values)
val folderNames = getCustomOrderedFolderNames(idToSettings.values, customOrder)
// customOrder maybe outdated (order specified not all RC), so, base sort by type and folder is applied
list.sortWith(compareByTypeAndFolderAndCustomComparator(folderNames) { o1, o2 ->
val index1 = customOrder.getInt(o1.uniqueID)
@@ -242,6 +243,22 @@ private fun getSortedFolderNames(list: Collection<RunnerAndConfigurationSettings
return result
}
private fun getCustomOrderedFolderNames(
list: Collection<RunnerAndConfigurationSettings>,
customOrder: Object2IntMap<String>,
): List<String?> {
val folderNamesWithOrder = ArrayList<Pair<String, Int>>()
for (settings in list) {
val folderName = settings.folderName
if (folderName != null) {
val order = customOrder.getInt(settings.uniqueID)
folderNamesWithOrder.add(Pair(folderName, order))
}
}
folderNamesWithOrder.sortBy { it.second }
return folderNamesWithOrder.map { it.first }.distinct().plus(null)
}
internal fun Collection<RunnerAndConfigurationSettings>.managedOnly(): Sequence<RunnerAndConfigurationSettings> {
return asSequence().filter { it.type.isManaged }
}