don't construct Map<X,null> type, it'll fail

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 5b3e5fa90e5fcda3a38dfcc13b81396a0b1422d2..938626ec586a9780255db5c7696ea21948e55510 100644 (file)
--- 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);
   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;
       return factory.createTypeFromText("java.util.Map.Entry<" + key.getCanonicalText() + ", " + value.getCanonicalText() + ">", context);
     }
     return null;