From f0e5bb5cc8178f95a1033000ee888329847c371f Mon Sep 17 00:00:00 2001 From: Alexander Kass Date: Mon, 6 Jun 2016 10:14:30 +0300 Subject: [PATCH] incorrect intention popup position for oneline editor ++ --- .../src/com/intellij/ui/popup/PopupFactoryImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java index fd7ad80c3081..a2d4339ab2d7 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -675,13 +675,8 @@ public class PopupFactoryImpl extends JBPopupFactory { Point p = editor.visualPositionToXY(new VisualPosition(visualPosition.line + 1, visualPosition.column)); final Rectangle visibleArea = editor.getScrollingModel().getVisibleArea(); - if (!visibleArea.contains(p)) { - int h = editor.getLineHeight(); - p.y -= h; - if (!visibleArea.contains(p)) return null; - p.y += h; - } - return p; + return !visibleArea.contains(p) && !visibleArea.contains(p.x, p.y - editor.getLineHeight()) + ? null : p; } @Override