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: do no record originator for non-physical documents (like refactorings dialogs)

Browse Source
This commit is contained in:
Anton Makeev
2012-07-11 14:18:50 +02:00
parent 647a9d01a4
commit dbb9614a6b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java
+8
View File
@@ -231,6 +231,14 @@ public class CommandMerger {
return !myCurrentActions.isEmpty();
}
public boolean isPhysical() {
if (myAllAffectedDocuments.isEmpty()) return false;
for (DocumentReference each : myAllAffectedDocuments) {
if (each.getFile() == null) return false;
}
return true;
}
public boolean isUndoAvailable(@NotNull Collection<DocumentReference> refs) {
if (hasNonUndoableActions()) {
return false;
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
+1 -1
View File
@@ -283,7 +283,7 @@ public class UndoManagerImpl extends UndoManager implements ProjectComponent, Ap
myCommandLevel--;
if (myCommandLevel > 0) return;
if (myProject != null && myCurrentMerger.hasActions() && !myCurrentMerger.isTransparent()) {
if (myProject != null && myCurrentMerger.hasActions() && !myCurrentMerger.isTransparent() && myCurrentMerger.isPhysical()) {
addFocusedDocumentAsAffected();
}
myOriginatorReference = null;