From 27addff48282e208f5967821c90ee30bda67c760 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 6 Apr 2018 18:22:07 +0200 Subject: [PATCH] do not check temp rc limit on load --- .../execution/impl/RunConfigurationSchemeManager.kt | 2 +- .../com/intellij/execution/impl/RunManagerImpl.kt | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt index a4c56638d25a..93b5ab9d3803 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt @@ -32,7 +32,7 @@ internal class RunConfigurationSchemeManager(private val manager: RunManagerImpl override fun createScheme(dataHolder: SchemeDataHolder, name: String, attributeProvider: Function, isBundled: Boolean): RunnerAndConfigurationSettingsImpl { val settings = RunnerAndConfigurationSettingsImpl(manager) val element = readData(settings, dataHolder) - manager.addConfiguration(element, settings) + manager.addConfiguration(element, settings, isCheckRecentsLimit = false) return settings } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt index 9ce4c576d6c1..0daf8d806268 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt @@ -240,12 +240,11 @@ open class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persi singleton = factory.isConfigurationSingletonByDefault) } - override fun addConfiguration(settings: RunnerAndConfigurationSettings, isShared: Boolean) { - settings.isShared = isShared - addConfiguration(settings) + override fun addConfiguration(settings: RunnerAndConfigurationSettings) { + doAddConfiguration(settings, isCheckRecentsLimit = true) } - override fun addConfiguration(settings: RunnerAndConfigurationSettings) { + private fun doAddConfiguration(settings: RunnerAndConfigurationSettings, isCheckRecentsLimit: Boolean) { val newId = settings.uniqueID var existingId: String? = null lock.write { @@ -279,7 +278,7 @@ open class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persi } if (existingId == null) { - if (settings.isTemporary) { + if (isCheckRecentsLimit && settings.isTemporary) { checkRecentsLimit() } eventPublisher.runConfigurationAdded(settings) @@ -709,7 +708,7 @@ open class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persi return settings } - internal fun addConfiguration(element: Element, settings: RunnerAndConfigurationSettingsImpl) { + internal fun addConfiguration(element: Element, settings: RunnerAndConfigurationSettingsImpl, isCheckRecentsLimit: Boolean = true) { if (settings.isTemplate) { val factory = settings.factory lock.write { @@ -717,7 +716,7 @@ open class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persi } } else { - addConfiguration(settings) + doAddConfiguration(settings, isCheckRecentsLimit) if (element.getAttributeBooleanValue(SELECTED_ATTR)) { // to support old style selectedConfiguration = settings