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

IDEA-120858 dir-diff: do not apply changes on Enter if focus is in Editor

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-10-12 17:40:03 +03:00
parent ca282c5d08
commit 6928cbed1f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java
+3 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.openapi.diff.impl.dir.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.ex.ActionUtil;
import com.intellij.openapi.diff.impl.dir.DirDiffTableModel;
import com.intellij.util.containers.JBIterable;
@@ -40,7 +41,8 @@ public class SynchronizeDiff extends DirDiffAction {
if (!e.getPresentation().isEnabled()) {
return;
}
boolean enabled = !JBIterable.from(mySelectedOnly ? getModel().getSelectedElements() : getModel().getElements())
boolean enabled = e.getData(CommonDataKeys.EDITOR) == null;
enabled &= !JBIterable.from(mySelectedOnly ? getModel().getSelectedElements() : getModel().getElements())
.filter(d -> d.getOperation() == COPY_FROM || d.getOperation() == COPY_TO || d.getOperation() == DELETE)
.filter(d -> d.getSource() == null || d.getSource().isOperationsEnabled())
.filter(d -> d.getTarget() == null || d.getTarget().isOperationsEnabled())