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

Fix Run configurable modified tracking

Browse Source 
- Fix modified state when there is a temporary configuration
This commit is contained in:
Konstantin Aleev
2017-09-20 18:10:12 +03:00
parent ac6981a39d
commit c13a38817e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.kt
+8 -3
View File
@@ -857,10 +857,12 @@ open class RunConfigurable @JvmOverloads constructor(private val myProject: Proj
val configurationNodes = ArrayList<DefaultMutableTreeNode>()
collectNodesRecursively(typeNode, configurationNodes, CONFIGURATION, TEMPORARY_CONFIGURATION)
if (countSettingsOfType(allSettings, `object`) != configurationNodes.size) {
val allTypeSettings = allSettings.filter { it.type == `object` }
if (allTypeSettings.size != configurationNodes.size) {
return true
}
var currentTypeSettingsCount = 0
for (configurationNode in configurationNodes) {
val userObject = configurationNode.userObject
val settings: RunnerAndConfigurationSettings
@@ -877,9 +879,12 @@ open class RunConfigurable @JvmOverloads constructor(private val myProject: Proj
continue
}
val index = currentSettingCount++
currentSettingCount++
val index = currentTypeSettingsCount++
// we compare by instance, equals is not implemented and in any case object modification is checked by other logic
if (allSettings.size <= index || allSettings[index] !== settings) {
// we compare by index among current types settings because indexes among all configurations may differ
// since temporary configurations are stored in the end
if (allTypeSettings.size <= index || allTypeSettings[index] !== settings) {
return true
}
}
platform/lang-impl/src/com/intellij/execution/impl/runConfigurableHelper.kt
-2
View File
@@ -19,8 +19,6 @@ import com.intellij.execution.Executor
import com.intellij.execution.RunnerAndConfigurationSettings
import com.intellij.execution.configurations.ConfigurationType
fun countSettingsOfType(allSettings: List<RunnerAndConfigurationSettings>, type: ConfigurationType) = allSettings.count { it.type == type }
internal class RunConfigurationBean {
val settings: RunnerAndConfigurationSettings
val configurable: SingleConfigurationConfigurable<*>?