From: Aleksey Pivovarov Date: Wed, 1 Jul 2015 13:24:41 +0000 (+0300) Subject: vcs: disable "annotate selected/previous revision" in modal context X-Git-Tag: webstorm/142.4576~10^2~17 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=21b63cb1e823f4daaa3738e039891cbf2b4ede10 vcs: disable "annotate selected/previous revision" in modal context they will open new editor, but user can't access it without leaving modal context --- diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateRevisionAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateRevisionAction.java index 011d9c60e148..7af79f9c7a17 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateRevisionAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateRevisionAction.java @@ -1,6 +1,7 @@ package com.intellij.openapi.vcs.actions; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.vcs.AbstractVcs; @@ -34,6 +35,11 @@ abstract class AnnotateRevisionAction extends AnnotateRevisionActionBase impleme @Override public void update(@NotNull AnActionEvent e) { + if (Boolean.TRUE.equals(e.getData(PlatformDataKeys.IS_MODAL_CONTEXT))) { + e.getPresentation().setEnabledAndVisible(false); + return; + } + if (getRevisions() == null) { e.getPresentation().setEnabledAndVisible(false); return;