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

Simplify UndoRedoAction code (after IDEA-207347)

Browse Source
This commit is contained in:
Dmitry Batrak
2019-03-21 19:22:35 +03:00
parent 310a169186
commit b424d2e62d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/UndoRedoAction.java
+2 -5
View File
@@ -7,7 +7,6 @@ import com.intellij.openapi.command.undo.DocumentReference;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.command.undo.UndoableAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.project.DumbAwareAction;
@@ -68,9 +67,7 @@ public abstract class UndoRedoAction extends DumbAwareAction {
private UndoManager getUndoManager(FileEditor editor, DataContext dataContext) {
Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext);
Editor e = dataContext.getData(CommonDataKeys.EDITOR);
if (component instanceof JTextComponent &&
(e == null || component != e.getContentComponent() && !UIUtil.isClientPropertyTrue(component, IGNORE_SWING_UNDO_MANAGER))) {
if (component instanceof JTextComponent && !UIUtil.isClientPropertyTrue(component, IGNORE_SWING_UNDO_MANAGER)) {
return SwingUndoManagerWrapper.fromContext(dataContext);
}
JRootPane rootPane = null;
@@ -85,7 +82,7 @@ public abstract class UndoRedoAction extends DumbAwareAction {
}
}
if (myActionInProgress) {
LOG.error("Recursive undo invocation attempt, component: " + component + ", fileEditor: " + editor + ", editor: " + e +
LOG.error("Recursive undo invocation attempt, component: " + component + ", fileEditor: " + editor +
", rootPane: " + rootPane + ", popup: " + popup);
return null;
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java
+2
View File
@@ -5,6 +5,7 @@ import com.intellij.ide.CutProvider;
import com.intellij.ide.DataManager;
import com.intellij.ide.IdeEventQueue;
import com.intellij.ide.PasteProvider;
import com.intellij.ide.actions.UndoRedoAction;
import com.intellij.ide.ui.UISettings;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -96,6 +97,7 @@ public class EditorComponentImpl extends JTextComponent implements Scrollable, D
return myEditor.visualPositionToXY(magnificationPosition);
}
});
putClientProperty(UndoRedoAction.IGNORE_SWING_UNDO_MANAGER, Boolean.TRUE);
myApplication = (ApplicationImpl)ApplicationManager.getApplication();
// This editor extends JTextComponent rather than JComponent *only* for accessibility