From b0741dff054ade62dfb149442fb2cd3828a5d064 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 2 May 2017 16:02:22 +0300 Subject: [PATCH] vcs: simplify control flow --- .../openapi/vcs/changes/ChangeListWorker.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java index d4cddaad8715..191aa48d9a7c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java @@ -656,14 +656,10 @@ public class ChangeListWorker implements ChangeListsWriteOperations { List changes = new ArrayList<>(); for (ChangeList list : myMap.values()) { for (Change change : list.getChanges()) { - final ContentRevision afterRevision = change.getAfterRevision(); - if (afterRevision != null && afterRevision.getFile().isUnder(dirPath, false)) { - changes.add(change); - continue; - } - - final ContentRevision beforeRevision = change.getBeforeRevision(); - if (beforeRevision != null && beforeRevision.getFile().isUnder(dirPath, false)) { + ContentRevision after = change.getAfterRevision(); + ContentRevision before = change.getBeforeRevision(); + if (after != null && after.getFile().isUnder(dirPath, false) || + before != null && before.getFile().isUnder(dirPath, false)) { changes.add(change); } }