From 88dba5ecebe549578be853be4ce153629068a553 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 8 Sep 2011 14:54:32 +0200 Subject: [PATCH] IDEA-74055 NPE at com.intellij.codeInsight.template.macro.DescendantClassesEnumMacro.a --- .../template/macro/DescendantClassesEnumMacro.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java index b9468b5ce0df..5d979038950c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java @@ -68,7 +68,10 @@ public class DescendantClassesEnumMacro implements Macro { if (params == null || params.length == 0) return null; PsiManager instance = PsiManager.getInstance(context.getProject()); - final String paramResult = params[0].calculateResult(context).toString(); + Result result = params[0].calculateResult(context); + if (result == null) return null; + + final String paramResult = result.toString(); if (paramResult == null) return null; final boolean isAllowAbstract = isAllowAbstract(context, params);