From 6567d4ea2d716443dea5f4a7ec946de06df3e23e Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 30 May 2017 18:16:56 +0300 Subject: [PATCH] vcs: consume "Show Diff" shortcut in log if there are no changes * avoid spurious invocation of other actions (ex: "Compare Files") --- .../intellij/openapi/vcs/changes/ui/ChangesBrowserBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserBase.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserBase.java index a59071967d7d..0e520695ff16 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserBase.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserBase.java @@ -48,6 +48,7 @@ import javax.swing.border.Border; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import java.awt.*; +import java.awt.event.KeyEvent; import java.io.File; import java.util.*; import java.util.List; @@ -369,7 +370,7 @@ public abstract class ChangesBrowserBase extends JPanel implements TypeSafeDa protected void buildToolBar(final DefaultActionGroup toolBarGroup) { myDiffAction = new DumbAwareAction() { public void update(AnActionEvent e) { - e.getPresentation().setEnabled(canShowDiff()); + e.getPresentation().setEnabled(canShowDiff() || e.getInputEvent() instanceof KeyEvent); } public void actionPerformed(AnActionEvent e) {