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

apply "beforeRun" to all types of RC

Browse Source
This commit is contained in:
Nikita Skvortsov
2018-02-02 15:57:22 +03:00
parent 30d8f6437f
commit bdc0bc5f81
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/settings/RunConfigurationHandler.kt
+21 -17
View File
@@ -40,6 +40,7 @@ class RunConfigurationHandler: ConfigurationHandler {
private fun ConfigurationData.eachRunConfiguration(runManager: RunManager, visit: (RunConfigurationImporter, RunConfiguration, Map<String, *>) -> Unit) {
val runCfgMap = find("runConfigurations")
val runManagerEx = runManager as RunManagerEx
if (runCfgMap !is List<*>) return
@@ -66,18 +67,34 @@ class RunConfigurationHandler: ConfigurationHandler {
val isDefaults = cfg["defaults"].isTrue()
val runnerAndConfigurationSettings = if (isDefaults) {
runManager.getConfigurationTemplate(importer.configurationFactory)
runManagerEx.getConfigurationTemplate(importer.configurationFactory)
}
else {
runManager.createConfiguration(name, importer.configurationFactory)
runManagerEx.createConfiguration(name, importer.configurationFactory)
}
try {
visit(importer, runnerAndConfigurationSettings.configuration, cfg as Map<String, *>)
if (!isDefaults) {
runManager.addConfiguration(runnerAndConfigurationSettings)
runManagerEx.addConfiguration(runnerAndConfigurationSettings)
}
(cfg["beforeRun"] as? List<*>)?.let {
// TODO add extension point
it.filterIsInstance(Map::class.java)
.firstOrNull { it["id"] == "Make" }
?.let { cfg ->
val enabled = (cfg["enabled"] as? Boolean) ?: true
if (!enabled) {
val filtered = runManagerEx
.getBeforeRunTasks(runnerAndConfigurationSettings.configuration)
.filterNot { it.providerId == CompileStepBeforeRun.ID }
runManagerEx.setBeforeRunTasks(runnerAndConfigurationSettings.configuration, filtered)
}
}
}
} catch (e: Exception) {
LOG.warn("Error occurred when importing run configuration ${name}: ${e.message}", e)
}
@@ -107,26 +124,13 @@ class ApplicationRunConfigurationImporter : RunConfigurationImporter {
throw IllegalArgumentException("Module with name ${cfg["moduleName"]} can not be found")
}
val runManager = RunManager.getInstance(project) as RunManagerEx
(cfg["mainClass"] as? String)?.let { runConfiguration.mainClassName = it }
(cfg["jvmArgs"] as? String)?.let { runConfiguration.vmParameters = it }
(cfg["programParameters"] as? String)?.let { runConfiguration.programParameters = it }
(cfg["envs"] as? Map<*,*>)?.let { runConfiguration.envs = it as MutableMap<String, String> }
val runManager = RunManager.getInstance(project) as RunManagerEx
(cfg["beforeRun"] as? List<*>)?.let {
// TODO add extension point
it.filterIsInstance(Map::class.java)
.firstOrNull { it["id"] == "Make" }
?.let { cfg ->
val enabled =(cfg["enabled"] as? Boolean) ?: true
runManager.getBeforeRunTasks(runConfiguration, CompileStepBeforeRun.ID).firstOrNull()?.let { beforeRunTask ->
beforeRunTask.isEnabled = enabled
}
}
}
if (!isDefaults) {
runConfiguration.setModule(module)
}