From 441b07fc2c20aca940fcc7ddafec6cf5368cbc00 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 20 Sep 2018 19:59:30 +0300 Subject: [PATCH] vcs: cleanup - rename variable --- .../vcs/changes/actions/ChangeListRemoveConfirmation.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeListRemoveConfirmation.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeListRemoveConfirmation.kt index f04fc539ab63..018a0ece0253 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeListRemoveConfirmation.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ChangeListRemoveConfirmation.kt @@ -64,11 +64,11 @@ abstract class ChangeListRemoveConfirmation() { } val toRemoveLists = toRemove.mapNotNull { manager.getChangeList(it) } - val active = toRemoveLists.find { it.isDefault } - toRemoveLists.forEach { if (it != active) manager.removeChangeList(it.name) } + val defaultList = toRemoveLists.find { it.isDefault } + toRemoveLists.forEach { if (it != defaultList) manager.removeChangeList(it.name) } - if (active != null && RemoveChangeListAction.confirmActiveChangeListRemoval(project, listOf(active), active.getChanges().isEmpty())) { - manager.removeChangeList(active.name) + if (defaultList != null && RemoveChangeListAction.confirmActiveChangeListRemoval(project, listOf(defaultList), defaultList.getChanges().isEmpty())) { + manager.removeChangeList(defaultList.name) } } }