From c7bba07218041e5706995651ab2fe66a6c7d5e9c Mon Sep 17 00:00:00 2001
From: fabien <fabien@suntriprecords.com>
Date: Thu, 30 Apr 2020 19:15:41 +0200
Subject: [PATCH 1/3] #288 Add support for Idea 201

---
 README.md                                     |  2 +-
 build.gradle                                  | 17 +++++---
 src/main/java/gitflow/GitflowComponent.java   | 35 +++++----------
 src/main/java/gitflow/GitflowService.java     | 27 ++++++++++++
 .../gitflow/actions/FinishBugfixAction.java   |  2 +-
 .../gitflow/actions/FinishFeatureAction.java  |  2 +-
 .../gitflow/actions/FinishReleaseAction.java  |  2 +-
 .../java/gitflow/actions/GitflowAction.java   | 27 ++++++------
 .../java/gitflow/actions/GitflowActions.java  | 43 +++++++++++++------
 .../gitflow/actions/StartBugfixAction.java    |  3 +-
 .../gitflow/actions/StartFeatureAction.java   |  2 +-
 .../gitflow/actions/StartHotfixAction.java    |  2 +-
 .../ui/GitflowTaskDialogPanelProvider.java    | 10 +++--
 .../ui/GitflowUnsupportedVersionWidget.java   |  7 +--
 src/main/java/gitflow/ui/GitflowWidget.java   |  6 +--
 src/main/resources/META-INF/plugin.xml        |  7 +--
 16 files changed, 110 insertions(+), 84 deletions(-)
 create mode 100644 src/main/java/gitflow/GitflowService.java

diff --git a/README.md b/README.md
index d9b97b3..46e4d6b 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,6 @@ Feedback and suggestions are also very welcome.
 ## License
 
 This plugin is under the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0.html).
-Copyright 2013-2019, Opher Vishnia.
+Copyright 2013-2020, Opher Vishnia.
 
 
diff --git a/build.gradle b/build.gradle
index 6095d04..8f2140b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.7'
+    id 'org.jetbrains.intellij' version '0.4.18'
 }
 
 compileJava {
@@ -8,7 +8,7 @@ compileJava {
 }
 
 group 'gitflow4idea'
-version '0.7.1'
+version '0.7.2'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -22,18 +22,23 @@ dependencies {
 }
 
 intellij {
-    version '2019.3'
+    version '2020.1'
     plugins 'git4idea', 'tasks'
 }
 
 patchPluginXml {
     pluginId "Gitflow"
     pluginDescription 'Git Flow Integration'
-    version '0.7.1'
-    sinceBuild '182.0'
-    untilBuild '193.*'
+    version '0.7.2'
+    sinceBuild '201.0'
+    untilBuild '201.*'
     changeNotes """
 
+      <H2>Changelog for 0.7.2</H2>
+      <ul>
+        <li>Support for Idea build 201 #288 (@fabmars)</li>                     
+      </ul>
+
       <H2>Changelog for 0.7.1</H2>
       <ul>
         <li>Support for Idea build 193 #259 (@opherv)</li>                     
diff --git a/src/main/java/gitflow/GitflowComponent.java b/src/main/java/gitflow/GitflowComponent.java
index f26c1cb..3d748f8 100644
--- a/src/main/java/gitflow/GitflowComponent.java
+++ b/src/main/java/gitflow/GitflowComponent.java
@@ -1,6 +1,6 @@
 package gitflow;
 
-import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsListener;
@@ -12,41 +12,29 @@
 import git4idea.GitVcs;
 import gitflow.ui.GitflowUnsupportedVersionWidget;
 import gitflow.ui.GitflowWidget;
-import org.jetbrains.annotations.NotNull;
 
 
 /**
  * @author Opher Vishnia / opherv.com / opherv@gmail.com
+ * One instance per project
  */
-public class GitflowComponent implements ProjectComponent, VcsListener {
+public class GitflowComponent implements VcsListener, Disposable {
     Project myProject;
     GitflowWidget myGitflowWidget;
     MessageBus messageBus;
 
     public GitflowComponent(Project project) {
         myProject = project;
-    }
-
-    public void initComponent() {
         messageBus = myProject.getMessageBus();
         messageBus.connect().subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, this);
-    }
 
-    public void disposeComponent() {
-        // TODO: insert component disposal logic here
+        // Seems the event triggering this component happens after the directory mapping change, hence the incentive.
+        directoryMappingChanged();
     }
 
-    @NotNull
-    public String getComponentName() {
-        return "GitflowComponent";
-    }
-
-    public void projectOpened() {
-
-    }
-
-    public void projectClosed() {
-
+    @Override
+    public void dispose() {
+        // TODO: insert component disposal logic here
     }
 
     @Override
@@ -63,18 +51,15 @@ public void directoryMappingChanged() {
             //make sure to not reinitialize the widget if it's already present
             if (GitflowVersionTester.forProject(myProject).isSupportedVersion() && myGitflowWidget == null) {
                 myGitflowWidget = new GitflowWidget(myProject);
-                widgetToAdd = (StatusBarWidget) myGitflowWidget;
+                widgetToAdd = myGitflowWidget;
             } else {
                 widgetToAdd = new GitflowUnsupportedVersionWidget(myProject);
             }
 
             if (statusBar != null) {
-                statusBar.addWidget(widgetToAdd, "after " + git4idea.ui.branch.GitBranchWidget.class.getName(), myProject);
+                statusBar.addWidget(widgetToAdd, StatusBar.Anchors.after(git4idea.ui.branch.GitBranchWidget.class.getName()), myProject);
             }
         } else {
-            if (myGitflowWidget != null) {
-                myGitflowWidget.deactivate();
-            }
             myGitflowWidget = null;
         }
     }
diff --git a/src/main/java/gitflow/GitflowService.java b/src/main/java/gitflow/GitflowService.java
new file mode 100644
index 0000000..7bbf9e6
--- /dev/null
+++ b/src/main/java/gitflow/GitflowService.java
@@ -0,0 +1,27 @@
+package gitflow;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.startup.StartupActivity;
+import com.intellij.openapi.util.Disposer;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Fabien Marsaud / @fabmars
+ * Only one instance, runActivity is called every time a project is opened
+ */
+@Service
+public final class GitflowService implements StartupActivity {
+
+  @Override
+  public void runActivity(@NotNull Project project) {
+    // Ensure this isn't part of testing
+    if (!ApplicationManager.getApplication().isUnitTestMode()) {
+      // Install Git Flow widget
+      GitflowComponent gitflowComponent = new GitflowComponent(project);
+      // Prepare for when the project will be closed
+      Disposer.register(project, gitflowComponent);
+    }
+  }
+}
diff --git a/src/main/java/gitflow/actions/FinishBugfixAction.java b/src/main/java/gitflow/actions/FinishBugfixAction.java
index 6cc7a5f..30af59a 100644
--- a/src/main/java/gitflow/actions/FinishBugfixAction.java
+++ b/src/main/java/gitflow/actions/FinishBugfixAction.java
@@ -88,7 +88,7 @@ public void onSuccess() {
 
                 //merge conflicts if necessary
                 if (errorLineHandler.hasMergeError){
-                    if (handleMerge()){
+                    if (handleMerge(project)){
                         that.runAction(project, bugfixName);
                         FinishBugfixAction completeFinishBugfixAction = new FinishBugfixAction(myRepo, bugfixName);
                     }
diff --git a/src/main/java/gitflow/actions/FinishFeatureAction.java b/src/main/java/gitflow/actions/FinishFeatureAction.java
index 5c96b58..e328894 100644
--- a/src/main/java/gitflow/actions/FinishFeatureAction.java
+++ b/src/main/java/gitflow/actions/FinishFeatureAction.java
@@ -88,7 +88,7 @@ public void onSuccess() {
 
                 //merge conflicts if necessary
                 if (errorLineHandler.hasMergeError){
-                    if (handleMerge()){
+                    if (handleMerge(project)) {
                         that.runAction(project, featureName);
                         FinishFeatureAction completeFinishFeatureAction = new FinishFeatureAction(myRepo, featureName);
                     }
diff --git a/src/main/java/gitflow/actions/FinishReleaseAction.java b/src/main/java/gitflow/actions/FinishReleaseAction.java
index 1e383bb..2308029 100644
--- a/src/main/java/gitflow/actions/FinishReleaseAction.java
+++ b/src/main/java/gitflow/actions/FinishReleaseAction.java
@@ -102,7 +102,7 @@ public void onSuccess() {
 
 	                    //merge conflicts if necessary
 	                    if (errorLineHandler.hasMergeError){
-		                    if (handleMerge()) {
+		                    if (handleMerge(myProject)) {
 			                    FinishReleaseAction completeFinisReleaseAction = new FinishReleaseAction(releaseName, tagMessage);
 			                    completeFinisReleaseAction.actionPerformed(event);
 		                    }
diff --git a/src/main/java/gitflow/actions/GitflowAction.java b/src/main/java/gitflow/actions/GitflowAction.java
index f0d014a..f57728e 100644
--- a/src/main/java/gitflow/actions/GitflowAction.java
+++ b/src/main/java/gitflow/actions/GitflowAction.java
@@ -18,7 +18,7 @@
 
 import java.util.ArrayList;
 
-public class GitflowAction extends DumbAwareAction {
+public abstract class GitflowAction extends DumbAwareAction {
     Project myProject;
     Gitflow myGitflow = ServiceManager.getService(Gitflow.class);
     ArrayList<GitRepository> repos = new ArrayList<GitRepository>();
@@ -55,28 +55,31 @@ private void setup(Project project){
         branchUtil= GitflowBranchUtilManager.getBranchUtil(myRepo);
     }
 
-    public void runAction(Project project, final String baseBranchName, final String branchName, @Nullable final Runnable callInAwtLater){
+    public void runAction(final Project project, final String baseBranchName, final String branchName, @Nullable final Runnable callInAwtLater){
         setup(project);
     }
 
     //returns true if merge successful, false otherwise
-    public boolean handleMerge(){
-        //ugly, but required for intellij to catch up with the external changes made by
-        //the CLI before being able to run the merge tool
-        virtualFileMananger.syncRefresh();
+    public boolean handleMerge(final Project project) {
+        // FIXME As of 201.0 the async version of this method doesn't call the callback,
+        // else we'd use a FutureTask (which is a Runnable) and its get() method.
+        // Hence this ugly hack, to let the time to intellij to catch up with the external changes made by the CLI
+        // before being able to run the merge tool. Else the tool won't display and the Y/N dialog will appear directly!
         try {
-            Thread.sleep(500);
+            virtualFileMananger.syncRefresh();
+            Thread.sleep(750L); // delay had to be bumped with v 201
+        } catch (InterruptedException ignored) {
         }
-        catch (InterruptedException ignored) {
-        }
-
 
-        GitflowActions.runMergeTool();
+        GitflowActions.runMergeTool(project);
         myRepo.update();
+        return askUserForMergeSuccess(project);
+    }
 
+    private static boolean askUserForMergeSuccess(Project myProject) {
         //if merge was completed successfully, finish the action
         //note that if it wasn't intellij is left in the "merging state", and git4idea provides no UI way to resolve it
-	    //merging can be done via intellij itself or any other util
+        //merging can be done via intellij itself or any other util
         int answer = Messages.showYesNoDialog(myProject, "Was the merge completed succesfully?", "Merge", Messages.getQuestionIcon());
         if (answer==0){
             GitMerger gitMerger=new GitMerger(myProject);
diff --git a/src/main/java/gitflow/actions/GitflowActions.java b/src/main/java/gitflow/actions/GitflowActions.java
index c5b8ef6..e01aaa9 100644
--- a/src/main/java/gitflow/actions/GitflowActions.java
+++ b/src/main/java/gitflow/actions/GitflowActions.java
@@ -1,19 +1,10 @@
 package gitflow.actions;
 
-import com.intellij.dvcs.ui.BranchActionGroup;
-import com.intellij.dvcs.ui.PopupElementWithAdditionalInfo;
-import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFileManager;
-import git4idea.branch.GitBranchUtil;
-import git4idea.repo.GitRepository;
-import gitflow.Gitflow;
-import gitflow.GitflowBranchUtil;
-import gitflow.GitflowBranchUtilManager;
-import gitflow.GitflowConfigUtil;
+import git4idea.actions.GitResolveConflictsAction;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * All actions associated with Gitflow
@@ -22,9 +13,33 @@
  */
 public class GitflowActions {
 
-    public static void runMergeTool(){
-        git4idea.actions.GitResolveConflictsAction resolveAction= new git4idea.actions.GitResolveConflictsAction();
-        AnActionEvent e = new AnActionEvent(null, DataManager.getInstance().getDataContext(), ActionPlaces.UNKNOWN, new Presentation(""), ActionManager.getInstance(), 0);
+    public static void runMergeTool(Project project){
+        GitResolveConflictsAction resolveAction = new GitResolveConflictsAction();
+        AnActionEvent e = new AnActionEvent(null, new ProjectDataContext(project), ActionPlaces.UNKNOWN, new Presentation(""), ActionManager.getInstance(), 0);
         resolveAction.actionPerformed(e);
     }
+
+
+    /**
+     * Simple wrapper containing just enough to let the conflicts resolver to launch
+     * We could have transferred the DataContext or wrapped a HackyDataContext from the previous action,
+     * but that would make the semantics terrible
+     */
+    private final static class ProjectDataContext implements DataContext {
+        private Project project;
+
+        private ProjectDataContext(Project project) {
+            this.project = project;
+        }
+
+        @Nullable
+        @Override
+        public Object getData(@NotNull String dataId) {
+            if(CommonDataKeys.PROJECT.getName().equals(dataId)) {
+                return project;
+            } else {
+                throw new UnsupportedOperationException(dataId);
+            }
+        }
+    }
 }
diff --git a/src/main/java/gitflow/actions/StartBugfixAction.java b/src/main/java/gitflow/actions/StartBugfixAction.java
index fbe31d2..587be3a 100644
--- a/src/main/java/gitflow/actions/StartBugfixAction.java
+++ b/src/main/java/gitflow/actions/StartBugfixAction.java
@@ -36,7 +36,8 @@ public void actionPerformed(AnActionEvent e) {
         this.runAction(e.getProject(), baseBranchName, bugfixName, null);
     }
 
-    public void runAction(Project project, final String baseBranchName, final String bugfixName, @Nullable final Runnable callInAwtLater){
+    @Override
+    public void runAction(final Project project, final String baseBranchName, final String bugfixName, @Nullable final Runnable callInAwtLater){
         super.runAction(project, baseBranchName, bugfixName, callInAwtLater);
 
         new Task.Backgroundable(myProject, "Starting bugfix " + bugfixName, false) {
diff --git a/src/main/java/gitflow/actions/StartFeatureAction.java b/src/main/java/gitflow/actions/StartFeatureAction.java
index f9f735f..16e6134 100644
--- a/src/main/java/gitflow/actions/StartFeatureAction.java
+++ b/src/main/java/gitflow/actions/StartFeatureAction.java
@@ -36,7 +36,7 @@ public void actionPerformed(AnActionEvent e) {
         this.runAction(e.getProject(), baseBranchName, featureName, null);
     }
 
-    public void runAction(Project project, final String baseBranchName, final String featureName, @Nullable final Runnable callInAwtLater){
+    public void runAction(final Project project, final String baseBranchName, final String featureName, @Nullable final Runnable callInAwtLater){
         super.runAction(project, baseBranchName, featureName, callInAwtLater);
 
         new Task.Backgroundable(myProject, "Starting feature " + featureName, false) {
diff --git a/src/main/java/gitflow/actions/StartHotfixAction.java b/src/main/java/gitflow/actions/StartHotfixAction.java
index d4e4296..207eca0 100644
--- a/src/main/java/gitflow/actions/StartHotfixAction.java
+++ b/src/main/java/gitflow/actions/StartHotfixAction.java
@@ -38,7 +38,7 @@ public void actionPerformed(AnActionEvent e) {
         this.runAction(e.getProject(), baseBranchName, hotfixName, null);
     }
 
-    public void runAction(Project project, final String baseBranchName, final String hotfixName, @Nullable final Runnable callInAwtLater){
+    public void runAction(final Project project, final String baseBranchName, final String hotfixName, @Nullable final Runnable callInAwtLater){
         super.runAction(project, baseBranchName, hotfixName, callInAwtLater);
 
         new Task.Backgroundable(myProject, "Starting hotfix " + hotfixName, false) {
diff --git a/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java b/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java
index d71bc03..6e9e662 100644
--- a/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java
+++ b/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java
@@ -1,5 +1,4 @@
 package gitflow.ui;
-import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.tasks.LocalTask;
 import com.intellij.tasks.Task;
@@ -13,14 +12,19 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Enumeration;
-import java.util.HashMap;
 
 public class GitflowTaskDialogPanelProvider extends TaskDialogPanelProvider {
 
+    @Deprecated
     @Nullable
     @Override
     public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull Task task) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull LocalTask task) {
         GitRepository currentRepo = GitBranchUtil.getCurrentRepository(project);
         GitflowBranchUtil branchUtil = GitflowBranchUtilManager.getBranchUtil(currentRepo);
         if (branchUtil.hasGitflow()) {
diff --git a/src/main/java/gitflow/ui/GitflowUnsupportedVersionWidget.java b/src/main/java/gitflow/ui/GitflowUnsupportedVersionWidget.java
index e554cf8..80c9ab7 100644
--- a/src/main/java/gitflow/ui/GitflowUnsupportedVersionWidget.java
+++ b/src/main/java/gitflow/ui/GitflowUnsupportedVersionWidget.java
@@ -1,15 +1,10 @@
 package gitflow.ui;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.wm.StatusBarWidget;
-import com.intellij.openapi.wm.StatusBarWidget.TextPresentation;
 import com.intellij.openapi.wm.impl.status.EditorBasedWidget;
-import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.event.MouseEvent;
-
 public class GitflowUnsupportedVersionWidget extends EditorBasedWidget {
 
 	public GitflowUnsupportedVersionWidget(@NotNull Project project) {
@@ -24,7 +19,7 @@ public String ID() {
 
 	@Nullable
 	@Override
-	public WidgetPresentation getPresentation(@NotNull PlatformType type) {
+	public WidgetPresentation getPresentation() {
 		return new UnsupportedVersionWidgetPresentation();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/gitflow/ui/GitflowWidget.java b/src/main/java/gitflow/ui/GitflowWidget.java
index fc0930d..7ecef55 100644
--- a/src/main/java/gitflow/ui/GitflowWidget.java
+++ b/src/main/java/gitflow/ui/GitflowWidget.java
@@ -15,7 +15,6 @@
  */
 package gitflow.ui;
 
-import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -36,8 +35,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.event.MouseEvent;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import javax.swing.JFrame;
 
@@ -46,7 +43,6 @@
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryChangeListener;
 import git4idea.ui.branch.GitBranchWidget;
-import gitflow.actions.GitflowActions;
 
 /**
  * Status bar widget which displays actions for git flow
@@ -77,7 +73,7 @@ public String ID() {
     }
 
     @Override
-    public WidgetPresentation getPresentation(@NotNull PlatformType type) {
+    public WidgetPresentation getPresentation() {
         return this;
     }
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f588b16..03cdc6b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -99,15 +99,10 @@
         </group>
     </actions>
 
-    <project-components>
-        <component>
-            <implementation-class>gitflow.GitflowComponent</implementation-class>
-        </component>
-    </project-components>
-
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceInterface="gitflow.Gitflow" serviceImplementation="gitflow.GitflowImpl"/>
         <applicationService serviceInterface="gitflow.GitflowState" serviceImplementation="gitflow.GitflowState"></applicationService>
+        <postStartupActivity implementation="gitflow.GitflowService"/>
         <projectConfigurable instance="gitflow.GitflowConfigurable"/>
         <tasks.dialogPanelProvider implementation="gitflow.ui.GitflowTaskDialogPanelProvider"/>
     </extensions>

From e204b73a41aef74ac104f631a37066b9f6d37c67 Mon Sep 17 00:00:00 2001
From: fabien <fabien@suntriprecords.com>
Date: Thu, 30 Apr 2020 20:08:47 +0200
Subject: [PATCH 2/3] #288 Improvement to make sure the merge tool opens when
 there is a conflict

---
 .../java/gitflow/actions/GitflowAction.java   | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/gitflow/actions/GitflowAction.java b/src/main/java/gitflow/actions/GitflowAction.java
index f57728e..357f16a 100644
--- a/src/main/java/gitflow/actions/GitflowAction.java
+++ b/src/main/java/gitflow/actions/GitflowAction.java
@@ -61,19 +61,33 @@ public void runAction(final Project project, final String baseBranchName, final
 
     //returns true if merge successful, false otherwise
     public boolean handleMerge(final Project project) {
-        // FIXME As of 201.0 the async version of this method doesn't call the callback,
-        // else we'd use a FutureTask (which is a Runnable) and its get() method.
-        // Hence this ugly hack, to let the time to intellij to catch up with the external changes made by the CLI
-        // before being able to run the merge tool. Else the tool won't display and the Y/N dialog will appear directly!
+        // FIXME As of 201.0 the async version of this method still doesn't make use of the callback, else we'd
+        //  simply use a FutureTask (which is a Runnable) and its get() method prior to launching the merge tool.
+        virtualFileMananger.syncRefresh();
+
         try {
-            virtualFileMananger.syncRefresh();
-            Thread.sleep(750L); // delay had to be bumped with v 201
-        } catch (InterruptedException ignored) {
+            long start, end = System.currentTimeMillis();
+            do {
+                start = end;
+                // Hence this ugly hack, to let the time to intellij to catch up with the external changes made by the
+                // CLI before being able to run the merge tool. Else the tool won't have the right state, won't display,
+                // and the merge success Y/N dialog will appear directly! Anyway, in v193 500ms was sufficient,
+                // but in v201 the right value seems to be in the [700-750]ms range (on the committer's machine).
+                Thread.sleep(750L);
+
+                GitflowActions.runMergeTool(project); // The window is modal, so we can measure how long it's opened.
+                end = System.currentTimeMillis();
+            } while(end - start < 1000L); // Additional hack: a window open <1s obviously didn't open, let's try again.
+
+            myRepo.update();
+
+            // TODO it's still not perfect: an onscreen file will still display in a conflicted state when this dialog
+            //  appears and might confuse the user
+            return askUserForMergeSuccess(project);
+        }
+        catch (InterruptedException ignored) {
+            return false;
         }
-
-        GitflowActions.runMergeTool(project);
-        myRepo.update();
-        return askUserForMergeSuccess(project);
     }
 
     private static boolean askUserForMergeSuccess(Project myProject) {

From d9cb7d3529e0feb50c9f407fe94f546b9a182520 Mon Sep 17 00:00:00 2001
From: fabien <fabien@suntriprecords.com>
Date: Thu, 30 Apr 2020 20:23:19 +0200
Subject: [PATCH 3/3] #288 Cosmetic improvement so onscreen file doesn't show
 in a conflicted state after the merge tool is dismissed & when the Y/N dialog
 shows up.

---
 src/main/java/gitflow/actions/GitflowAction.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/gitflow/actions/GitflowAction.java b/src/main/java/gitflow/actions/GitflowAction.java
index 357f16a..aa752df 100644
--- a/src/main/java/gitflow/actions/GitflowAction.java
+++ b/src/main/java/gitflow/actions/GitflowAction.java
@@ -19,6 +19,9 @@
 import java.util.ArrayList;
 
 public abstract class GitflowAction extends DumbAwareAction {
+
+    private static final long VFM_REFRESH_DELAY = 750L;
+
     Project myProject;
     Gitflow myGitflow = ServiceManager.getService(Gitflow.class);
     ArrayList<GitRepository> repos = new ArrayList<GitRepository>();
@@ -73,7 +76,7 @@ public boolean handleMerge(final Project project) {
                 // CLI before being able to run the merge tool. Else the tool won't have the right state, won't display,
                 // and the merge success Y/N dialog will appear directly! Anyway, in v193 500ms was sufficient,
                 // but in v201 the right value seems to be in the [700-750]ms range (on the committer's machine).
-                Thread.sleep(750L);
+                Thread.sleep(VFM_REFRESH_DELAY);
 
                 GitflowActions.runMergeTool(project); // The window is modal, so we can measure how long it's opened.
                 end = System.currentTimeMillis();
@@ -81,8 +84,10 @@ public boolean handleMerge(final Project project) {
 
             myRepo.update();
 
-            // TODO it's still not perfect: an onscreen file will still display in a conflicted state when this dialog
-            //  appears and might confuse the user
+            // And refreshing again so an onscreen file doesn't show in a conflicted state when the Y/N dialog show up.
+            virtualFileMananger.syncRefresh();
+            Thread.sleep(VFM_REFRESH_DELAY);
+
             return askUserForMergeSuccess(project);
         }
         catch (InterruptedException ignored) {