From 6928cbed1fa4c6d910c6793cc6728251836adb4d Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 28 Aug 2017 17:59:46 +0300 Subject: [PATCH] IDEA-120858 dir-diff: do not apply changes on Enter if focus is in Editor --- .../openapi/diff/impl/dir/actions/SynchronizeDiff.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java index e3ed9b436e5e..9bc551e09aca 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java @@ -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())