From 800e69f616cf24f5f18ba2d741c403f5269be447 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 15 Jun 2012 10:34:10 +0200
Subject: [PATCH] Undo: asking confirmation when undoing 'reload from disk'
 command (IDEA-87407)

---
 .../src/com/intellij/ide/actions/ReloadFromDiskAction.java     | 3 +--
 .../openapi/fileEditor/impl/FileDocumentManagerImpl.java       | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java b/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java
index 94969d53c9d0..702f3c79d679 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java
@@ -22,8 +22,8 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
@@ -53,7 +53,6 @@ public class ReloadFromDiskAction extends AnAction implements DumbAware {
             new Runnable() {
               public void run() {
                 PsiManager.getInstance(project).reloadFromDisk(psiFile);
-                CommandProcessor.getInstance().markCurrentCommandAsGlobal(project);
               }
             }
           );
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
index fbfeb4b0b30a..28efc4d225f6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
@@ -21,6 +21,7 @@ import com.intellij.codeStyle.CodeStyleFacade;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.command.UndoConfirmationPolicy;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.DiffManager;
@@ -578,7 +579,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl
           }
         );
       }
-    }, UIBundle.message("file.cache.conflict.action"), null);
+    }, UIBundle.message("file.cache.conflict.action"), null, UndoConfirmationPolicy.REQUEST_CONFIRMATION);
 
     myUnsavedDocuments.remove(document);