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

fixes due to review IDEA-CR-31922

Browse Source 
(cherry picked from commit a9c6815)
This commit is contained in:
Kirill.Skrygan
2018-04-19 18:19:45 +02:00
parent ebad8873d5
commit 8b95f4aa62
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
+4 -18
View File
@@ -27,9 +27,6 @@ abstract class UndoRedo {
protected final FileEditor myEditor;
protected final UndoableGroup myUndoableGroup;
//prevent from reentrancy when falling back to global undo stack
private boolean myIsDelegatingToGlobalUndo = false;
//public static void execute(UndoManagerImpl manager, FileEditor editor, boolean isUndo) {
// do {
// UndoRedo undoOrRedo = isUndo ? new Undo(manager, editor) : new Redo(manager, editor);
@@ -146,22 +143,11 @@ abstract class UndoRedo {
private boolean tryFallbackToGlobalUndo() {
UndoableGroup globalUndoableGroup = getStackHolder().findGlobalUndoableGroup(myUndoableGroup);
if (globalUndoableGroup != null) {
if (myIsDelegatingToGlobalUndo) {
return false;
if (isRedo()) {
myManager.redo(null);
}
try {
myIsDelegatingToGlobalUndo = true;
if (isRedo()) {
myManager.redo(null);
}
else {
myManager.undo(null);
}
}
finally {
myIsDelegatingToGlobalUndo = false;
else {
myManager.undo(null);
}
return true;