MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Undo: asking confirmation when undoing 'reload from disk' command (IDEA-87407)

Browse Source
This commit is contained in:
Anton Makeev
2012-06-15 10:35:03 +02:00
parent b166db5d12
commit 800e69f616
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/ReloadFromDiskAction.java
+1 -2
View File
@@ -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);
}
}
);
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
+2 -1
View File
@@ -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);