From 11ad4829a70f7c8dcaaf9ac13b226ff2432b8b14 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 5 Mar 2018 16:13:25 +0300
Subject: [PATCH] IDEA-187706 vcs: preselect first included file in tree in
 commit dialog

bug introduced in: 5c156006ae6b034175b73b9ca28b56916edf2b26
---
 .../openapi/vcs/changes/ui/CommitChangeListDialog.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index 627882731b03..e3708df7638f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -312,8 +312,9 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
 
       if (initialSelection != null) browser.setSelectedChangeList(initialSelection);
       myCommitMessageArea.setChangeList(browser.getSelectedChangeList());
-
       browser.getViewer().setIncludedChanges(included);
+      browser.getViewer().rebuildTree();
+      browser.getViewer().setKeepTreeState(true);
 
       DiffCommitMessageEditor commitMessageEditor = new DiffCommitMessageEditor(myProject, myCommitMessageArea);
       browser.setBottomDiffComponent(commitMessageEditor);
@@ -329,7 +330,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       });
 
       browser.getViewer().addSelectionListener(() -> SwingUtilities.invokeLater(() -> changeDetails()));
-      browser.getViewer().setKeepTreeState(true);
     }
 
     myChangesInfoCalculator = new ChangeInfoCalculator();