From 7cefbc8d9c0a4f6e49e9fda18e04b5e2e9bfb1d1 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 18 Feb 2013 09:59:13 +0100 Subject: [PATCH] EA-43977 - NPE: UnwrapTagFix.applyFix --- .../codeInsight/inspections/UnwrapTagFix.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java index b0fc0a4dc474..1723db0a79fd 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java @@ -52,13 +52,17 @@ public class UnwrapTagFix implements LocalQuickFix { final PsiElement element = descriptor.getPsiElement(); if (element != null) { final XmlTag xmlTag = PsiTreeUtil.getParentOfType(element, XmlTag.class); - final XmlTag parentTag = xmlTag.getParentTag(); - final PsiElement[] children = PsiTreeUtil.getChildrenOfType(xmlTag, XmlTagChild.class); - if (children.length > 0) { - parentTag.addRange(children[0], children[children.length - 1]); + if (xmlTag != null) { + final XmlTag parentTag = xmlTag.getParentTag(); + final PsiElement[] children = PsiTreeUtil.getChildrenOfType(xmlTag, XmlTagChild.class); + if (children != null) { + if (children.length > 0) { + parentTag.addRange(children[0], children[children.length - 1]); + } + xmlTag.delete(); + CodeStyleManager.getInstance(project).reformat(parentTag); + } } - xmlTag.delete(); - CodeStyleManager.getInstance(project).reformat(parentTag); } } }