From 3da07b7af27f1f7c3bb58b7500f17b67ad2a8b02 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 20 Jul 2015 14:47:36 +0300
Subject: [PATCH] diff: mark chevrone actions as DumbAware

---
 .../com/intellij/openapi/diff/actions/MergeActionGroup.java  | 3 ++-
 .../openapi/diff/impl/incrementalMerge/MergeList.java        | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java
index 02fb68bc09a6..908238373d23 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeActionGroup.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.diff.impl.DiffPanelImpl;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
+import com.intellij.openapi.project.DumbAwareAction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,7 +65,7 @@ public class MergeActionGroup extends ActionGroup {
     }
   }
 
-  public static class OperationAction extends AnAction {
+  public static class OperationAction extends DumbAwareAction {
     private final MergeOperations.Operation myOperation;
 
     public OperationAction(MergeOperations.Operation operation) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 583b08547646..106daac84ee8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -33,6 +33,7 @@ import com.intellij.openapi.diff.impl.util.ContextLogger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ex.DocumentEx;
+import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.*;
 import com.intellij.util.containers.ContainerUtil;
@@ -236,13 +237,13 @@ public class MergeList implements UserDataHolder {
     for (int i = 0; i < changeList.getCount(); i++) {
       final Change change = changeList.getChange(i);
       if (!change.canHasActions(originalSide)) continue;
-      AnAction applyAction = new AnAction(DiffBundle.message("merge.dialog.apply.change.action.name"), null, AllIcons.Diff.Arrow) {
+      AnAction applyAction = new DumbAwareAction(DiffBundle.message("merge.dialog.apply.change.action.name"), null, AllIcons.Diff.Arrow) {
         @Override
         public void actionPerformed(@Nullable AnActionEvent e) {
           apply(change);
         }
       };
-      AnAction ignoreAction = new AnAction(DiffBundle.message("merge.dialog.ignore.change.action.name"), null, AllIcons.Diff.Remove) {
+      AnAction ignoreAction = new DumbAwareAction(DiffBundle.message("merge.dialog.ignore.change.action.name"), null, AllIcons.Diff.Remove) {
         @Override
         public void actionPerformed(@Nullable AnActionEvent e) {
           change.removeFromList();