From 19ecb1add7d5733db8203454f2969afe29b0adc5 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 12 Mar 2010 19:57:46 +0000 Subject: [PATCH 1/1] don't construct Map type, it'll fail --- .../groovy/lang/psi/impl/statements/params/GrParameterImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java index 5b3e5fa90e5f..938626ec586a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java @@ -200,7 +200,7 @@ public class GrParameterImpl extends GrVariableImpl implements GrParameter { private static PsiType getEntryForMap(PsiType map, PsiElementFactory factory, PsiElement context) { PsiType key = PsiUtil.substituteTypeParameter(map, CommonClassNames.JAVA_UTIL_MAP, 0, true); PsiType value = PsiUtil.substituteTypeParameter(map, CommonClassNames.JAVA_UTIL_MAP, 1, true); - if (key != null && value != null) { + if (key != null && key != PsiType.NULL && value != null && value != PsiType.NULL) { return factory.createTypeFromText("java.util.Map.Entry<" + key.getCanonicalText() + ", " + value.getCanonicalText() + ">", context); } return null; -- 2.32.0