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 check temp rc limit on load

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-04-06 18:22:07 +02:00
parent 51fc5dd604
commit 27addff482
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt
+1 -1
View File
@@ -32,7 +32,7 @@ internal class RunConfigurationSchemeManager(private val manager: RunManagerImpl
override fun createScheme(dataHolder: SchemeDataHolder<RunnerAndConfigurationSettingsImpl>, name: String, attributeProvider: Function<String, String?>, isBundled: Boolean): RunnerAndConfigurationSettingsImpl {
val settings = RunnerAndConfigurationSettingsImpl(manager)
val element = readData(settings, dataHolder)
manager.addConfiguration(element, settings)
manager.addConfiguration(element, settings, isCheckRecentsLimit = false)
return settings
}
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
+6 -7
View File
@@ -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