From 453b655becec490d999a331e7970ab54d5202e85 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 20 Mar 2012 12:46:08 +0100 Subject: [PATCH] fix NPE (EA-34593) --- .../codeInsight/editorActions/XmlAutoPopupHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java index 139ea62d72b4..97cbbcef64c8 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlAutoPopupHandler.java @@ -117,7 +117,10 @@ public class XmlAutoPopupHandler extends TypedHandlerDelegate { Boolean result = isRelevantLanguage.get(); if (result == null) { Language language = element.getLanguage(); - if (element instanceof PsiWhiteSpace) language = element.getParent().getLanguage(); + PsiElement parent = element.getParent(); + if (element instanceof PsiWhiteSpace && parent != null) { + language = parent.getLanguage(); + } result = language instanceof XMLLanguage || isAntFile.booleanValue(); isRelevantLanguage.set(result); }