From 6c8f1a0aaea2124e8068082e2196cb1c49d549b9 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 11 Mar 2016 11:50:10 +0300 Subject: [PATCH] Revert "lst: do not use hardcoded constant" EA-80375 - NPE: LineStatusTrackerDrawing$PopupPanel.getEditorTextOffset There are no editor for added lines, but we want popup to always have the same offset. This reverts commit 87624908fd6a13f98c6de02ad50befbb13942f64. --- .../com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java index 8ea6c89fda58..fa1aee817e20 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java @@ -480,7 +480,7 @@ public class LineStatusTrackerDrawing { } private static class PopupPanel extends JPanel { - private final JComponent myEditorComponent; + @Nullable private final JComponent myEditorComponent; public PopupPanel(@NotNull final Editor editor, @NotNull ActionToolbar toolbar, @@ -548,7 +548,7 @@ public class LineStatusTrackerDrawing { } public int getEditorTextOffset() { - return myEditorComponent.getInsets().left; + return 3; // myEditorComponent.getInsets().left } } }