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

do not write before run tasks for unknown run configuration

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-04-10 22:18:55 +02:00
parent e3a525339b
commit 71d2d28c0d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
+5 -7
View File
@@ -513,8 +513,7 @@ class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persistent
settings.forEach { parentNode.addContent((it as RunnerAndConfigurationSettingsImpl).writeScheme()) }
}
internal fun writeBeforeRunTasks(settings: RunnerAndConfigurationSettings, configurationElement: Element) {
val configuration = settings.configuration
internal fun writeBeforeRunTasks(settings: RunnerAndConfigurationSettings, configuration: RunConfiguration): Element? {
var tasks = if (settings.isTemplate) configuration.beforeRunTasks else getEffectiveBeforeRunTasks(configuration, ownIsOnlyEnabled = false, isDisableTemplateTasks = false)
if (!tasks.isEmpty() && !settings.isTemplate) {
@@ -541,18 +540,17 @@ class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persistent
}
if (tasks.isEmpty() && settings.isNewSerializationAllowed) {
return
return null
}
val methodsElement = Element(METHOD)
val methodElement = Element(METHOD)
for (task in tasks) {
val child = Element(OPTION)
child.setAttribute(NAME_ATTR, task.providerId.toString())
task.writeExternal(child)
methodsElement.addContent(child)
methodElement.addContent(child)
}
configurationElement.addContent(methodsElement)
return methodElement
}
override fun loadState(parentNode: Element) {
platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.kt
+5 -3
View File
@@ -254,10 +254,12 @@ class RunnerAndConfigurationSettingsImpl @JvmOverloads constructor(private val m
val element = Element("configuration")
writeExternal(element)
_configuration?.let {
manager.writeBeforeRunTasks(this, element)
val configuration = _configuration
if (configuration != null && configuration !is UnknownRunConfiguration) {
manager.writeBeforeRunTasks(this, configuration)?.let {
element.addContent(it)
}
}
return element
}