From db9e26a218fbb09f47638a00f87309b47fd984c4 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Fri, 2 Dec 2011 13:49:05 +0300 Subject: [PATCH] EA-32366: fix NPE in GormPropertiesListReferenceReferenceProvider. --- .../expressions/CompleteReferenceExpression.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java index 0e4e1ae14b8b..54bdbe6af25b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java @@ -149,8 +149,12 @@ public class CompleteReferenceExpression { } @NotNull - public static LookupElementBuilder createPropertyLookupElement(@NotNull String name, @NotNull PsiType type) { - return LookupElementBuilder.create(name).setIcon(GroovyIcons.PROPERTY).setTypeText(type.getPresentableText()); + public static LookupElementBuilder createPropertyLookupElement(@NotNull String name, @Nullable PsiType type) { + LookupElementBuilder res = LookupElementBuilder.create(name).setIcon(GroovyIcons.PROPERTY); + if (type != null) { + res = res.setTypeText(type.getPresentableText()); + } + return res; } @Nullable