From c787a5adfbae52564e83f34d5166ce85e3a653ea Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 30 Jan 2015 20:48:01 +0100 Subject: [PATCH] EA-55097 fix NPE --- .../intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java index e348b712b087..9a5f429a92ef 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java @@ -103,9 +103,10 @@ public class DarculaTextFieldUI extends BasicTextFieldUI { protected void showSearchPopup() { final Object value = myTextField.getClientProperty("JTextField.Search.FindPopup"); - if (value instanceof JPopupMenu) { + final JTextComponent editor = getComponent(); + if (editor != null && value instanceof JPopupMenu) { final JPopupMenu popup = (JPopupMenu)value; - popup.show(getComponent(), getSearchIconCoord().x, getComponent().getHeight()); + popup.show(editor, getSearchIconCoord().x, editor.getHeight()); } }