From b5512f0eaca9af6786a73a05dcfe5cedc6be38ae Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 25 Oct 2011 16:11:03 +0200 Subject: [PATCH] EA-30897 - NPE: EditorTextField$4.getAttributes --- platform/platform-impl/src/com/intellij/ui/EditorTextField.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java index 685c3402606b..8fbb787d9e56 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java @@ -408,7 +408,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener, @Override public TextAttributes getAttributes(TextAttributesKey key) { final TextAttributes attributes = super.getAttributes(key); - if (!isEnabled()) { + if (!isEnabled() && attributes != null) { return new TextAttributes(UIUtil.getInactiveTextColor(), attributes.getBackgroundColor(), attributes.getEffectColor(), attributes.getEffectType(), attributes.getFontType()); }