From d7ad092c3835bbc8dd0a10243b197f04bf975de4 Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 14 Dec 2012 16:57:07 +0400 Subject: [PATCH] IDEA-97080 There is no popup menu on annotation gutter if file is short show annotation actions popup no matter where on gutter --- .../openapi/editor/impl/EditorGutterComponentImpl.java | 2 +- .../intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java index fa9efad4625b..037553869207 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java @@ -1375,7 +1375,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse final List addActions = new ArrayList(); final Point p = e.getPoint(); int line = myEditor.yPositionToLogicalLine((int)p.getY()); - if (line >= myEditor.getDocument().getLineCount()) return; + //if (line >= myEditor.getDocument().getLineCount()) return; for (TextAnnotationGutterProvider gutterProvider : myTextAnnotationGutters) { final List list = gutterProvider.getPopupActions(line, myEditor); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java index 72acaf90efb3..c542757c8859 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java @@ -80,7 +80,9 @@ class ShowDiffFromAnnotation extends AnAction implements LineNumberListener { @Override public void update(AnActionEvent e) { - e.getPresentation().setVisible(myEnabled && getActualLineNumber() >= 0); + final int number = getActualLineNumber(); + e.getPresentation().setVisible(myEnabled); + e.getPresentation().setEnabled(myEnabled && number >= 0 && number < myFileAnnotation.getLineCount()); } private int getActualLineNumber() {